- relocatable instdir

Changed files:
    MigrationTools-instdir.patch -> 1.3
    MigrationTools-mktemp.patch -> 1.2

diff --git a/MigrationTools-instdir.patch b/MigrationTools-instdir.patch
index 92c9e06f3c7bafa008c2275094768467af112f4b..7ed29a850807602e8c2fc45d0c717ba3ef61ac20 100644 (file)
--- a/MigrationTools-instdir.patch
+++ b/MigrationTools-instdir.patch
@@ -7,7 +7,7 @@ magic to let them be called from anywhere.
  
  PATH=$PATH:.
  export PATH
-+INSTDIR=/usr/share/openldap/migration/
++INSTDIR=%INSTDIR%
  
  TMPDIR="/tmp"
  ETC_PASSWD="$TMPDIR/passwd.$$.ldap"
@@ -26,7 +26,7 @@ magic to let them be called from anywhere.
  
  PATH=$PATH:.
  export PATH
-+INSTDIR=/usr/share/openldap/migration/
++INSTDIR=%INSTDIR%
  
  TMPDIR="/tmp"
  ETC_PASSWD="$TMPDIR/passwd.$$.ldap"
@@ -45,7 +45,7 @@ magic to let them be called from anywhere.
  
  PATH=$PATH:.
  export PATH
-+INSTDIR=/usr/share/openldap/migration/
++INSTDIR=%INSTDIR%
  
  TMPDIR="/tmp"
  ETC_PASSWD="$TMPDIR/passwd.$$.ldap"
@@ -65,7 +65,7 @@ magic to let them be called from anywhere.
  PATH=$PATH:.
  export PATH
 -
-+INSTDIR=/usr/share/openldap/migration/
++INSTDIR=%INSTDIR%
  
  TMPDIR="/tmp"
  ETC_PASSWD="$TMPDIR/passwd.$$.ldap"
@@ -84,7 +84,7 @@ magic to let them be called from anywhere.
  
  PATH=$PATH:/usr/lib/nis:.
  export PATH
-+INSTDIR=/usr/share/openldap/migration/
++INSTDIR=%INSTDIR%
  
  TMPDIR="/tmp"
  ETC_PASSWD="$TMPDIR/passwd.$$.ldap"
@@ -104,7 +104,7 @@ magic to let them be called from anywhere.
  PATH=$PATH:.
  export PATH
 -
-+INSTDIR=/usr/share/openldap/migration/
++INSTDIR=%INSTDIR%
  
  TMPDIR="/tmp"
  ETC_PASSWD="$TMPDIR/passwd.$$.ldap"
@@ -123,7 +123,7 @@ magic to let them be called from anywhere.
  # Luke Howard <lukeh@padl.com> April 1997
  #
  
-+INSTDIR=/usr/share/openldap/migration/
++INSTDIR=%INSTDIR%
  DB="/tmp/nis.$$.ldif"
  
  if [ "X$ETC_ALIASES" = "X" ]; then
@@ -179,7 +179,7 @@ magic to let them be called from anywhere.
  SHELL=/bin/sh
  export SHELL
  
-+INSTDIR=/usr/share/openldap/migration/
++INSTDIR=%INSTDIR%
 +
  DB=/tmp/nis.$$.ldif
  

diff --git a/MigrationTools-mktemp.patch b/MigrationTools-mktemp.patch
index dad3c533754466d353739403bef5597e306c0720..7605cbdbc7c4333ac6bad5933d6c63359c59ab5d 100644 (file)
--- a/MigrationTools-mktemp.patch
+++ b/MigrationTools-mktemp.patch
@@ -3,7 +3,7 @@ Use mktemp to generate temporary files.
 --- MigrationTools-36/migrate_all_netinfo_offline.sh   Mon Feb  5 11:39:14 2001
 +++ MigrationTools-36/migrate_all_netinfo_offline.sh   Mon Feb  5 11:39:14 2001
 @@ -41,15 +41,15 @@
- INSTDIR=/usr/share/openldap/migration/
+ INSTDIR=%INSTDIR%
  
  TMPDIR="/tmp"
 -ETC_PASSWD="$TMPDIR/passwd.$$.ldap"
@@ -30,7 +30,7 @@ Use mktemp to generate temporary files.
 --- MigrationTools-36/migrate_all_netinfo_online.sh    Mon Feb  5 11:39:14 2001
 +++ MigrationTools-36/migrate_all_netinfo_online.sh    Mon Feb  5 11:39:14 2001
 @@ -41,15 +41,15 @@
- INSTDIR=/usr/share/openldap/migration/
+ INSTDIR=%INSTDIR%
  
  TMPDIR="/tmp"
 -ETC_PASSWD="$TMPDIR/passwd.$$.ldap"
@@ -57,7 +57,7 @@ Use mktemp to generate temporary files.
 --- MigrationTools-36/migrate_all_nisplus_offline.sh   Mon Feb  5 11:39:14 2001
 +++ MigrationTools-36/migrate_all_nisplus_offline.sh   Mon Feb  5 11:43:23 2001
 @@ -41,16 +41,16 @@
- INSTDIR=/usr/share/openldap/migration/
+ INSTDIR=%INSTDIR%
  
  TMPDIR="/tmp"
 -ETC_PASSWD="$TMPDIR/passwd.$$.ldap"
@@ -86,7 +86,7 @@ Use mktemp to generate temporary files.
 --- MigrationTools-36/migrate_all_nisplus_online.sh    Mon Feb  5 11:39:14 2001
 +++ MigrationTools-36/migrate_all_nisplus_online.sh    Mon Feb  5 11:45:18 2001
 @@ -41,16 +41,16 @@
- INSTDIR=/usr/share/openldap/migration/
+ INSTDIR=%INSTDIR%
  
  TMPDIR="/tmp"
 -ETC_PASSWD="$TMPDIR/passwd.$$.ldap"
@@ -117,7 +117,7 @@ Use mktemp to generate temporary files.
 @@ -42,7 +42,7 @@
  #
  
- INSTDIR=/usr/share/openldap/migration/
+ INSTDIR=%INSTDIR%
 -DB="/tmp/nis.$$.ldif"
 +DB=`mktemp /tmp/nis.ldif.XXXXXX`
  
@@ -127,7 +127,7 @@ Use mktemp to generate temporary files.
 +++ MigrationTools-36/migrate_all_online.sh    Mon Feb  5 11:39:14 2001
 @@ -40,7 +40,7 @@
  
- INSTDIR=/usr/share/openldap/migration/
+ INSTDIR=%INSTDIR%
  
 -DB=/tmp/nis.$$.ldif
 +DB=`mktemp /tmp/nis.ldif.XXXXXX`
@@ -137,7 +137,7 @@ Use mktemp to generate temporary files.
 --- MigrationTools-36/migrate_all_nis_offline.sh       Mon Feb  5 11:39:14 2001
 +++ MigrationTools-36/migrate_all_nis_offline.sh       Mon Feb  5 11:39:14 2001
 @@ -41,15 +41,15 @@
- INSTDIR=/usr/share/openldap/migration/
+ INSTDIR=%INSTDIR%
  
  TMPDIR="/tmp"
 -ETC_PASSWD="$TMPDIR/passwd.$$.ldap"
@@ -164,7 +164,7 @@ Use mktemp to generate temporary files.
 --- MigrationTools-36/migrate_all_nis_online.sh        Mon Feb  5 11:39:14 2001
 +++ MigrationTools-36/migrate_all_nis_online.sh        Mon Feb  5 11:39:14 2001
 @@ -41,15 +41,15 @@
- INSTDIR=/usr/share/openldap/migration/
+ INSTDIR=%INSTDIR%
  
  TMPDIR="/tmp"
 -ETC_PASSWD="$TMPDIR/passwd.$$.ldap"