- (bal) aixbff package updated by dtucker@zip.com.au

diff --git a/ChangeLog b/ChangeLog
index 43e0afea3740076767008cea790dd0a2f1996899..1ff58a7466ef0672968179979bbe5e0a1b0ae84b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+20020717
+ - (bal) aixbff package updated by dtucker@zip.com.au
+
 20020716
  - (tim) [contrib/solaris/opensshd.in] Only kill sshd if .pid file found
 

diff --git a/contrib/aix/buildbff.sh b/contrib/aix/buildbff.sh
index d531e53f432b022503e10ced90dd42447072ddf1..5c09c6b758697613a31c200a6e0f3f01aa2b4475 100755 (executable)
--- a/contrib/aix/buildbff.sh
+++ b/contrib/aix/buildbff.sh
@@ -18,6 +18,16 @@ X11_FORWARDING=no
 
 umask 022
 
+startdir=`pwd`
+
+# Path to inventory.sh: same place as buildbff.sh
+if  echo $0 | egrep '^/'
+then
+       inventory=`dirname $0`/inventory.sh             # absolute path
+else
+       inventory=`pwd`/`dirname $0`/inventory.sh       # relative path
+fi
+
 #
 # We still support running from contrib/aix, but this is depreciated
 #
@@ -45,14 +55,6 @@ objdir=`pwd`
 PKGNAME=openssh
 PKGDIR=package
 
-# Path to inventory.sh: same place as buildbff.sh
-if  echo $0 | egrep '^/'
-then
-       inventory=`dirname $0`/inventory.sh             # absolute path
-else
-       inventory=`pwd`/`dirname $0`/inventory.sh       # relative path
-fi
-
 #
 # Collect local configuration settings to override defaults
 #
@@ -328,15 +330,10 @@ rm -f $PKGNAME-$VERSION.bff
 ) | backup  -i -q -f ../$PKGNAME-$VERSION.bff $filelist
 
 #
-# Move package into final location
+# Move package into final location and clean up
 #
-if [ "$contribaix" = "1" ]
-then
-       mv ../$PKGNAME-$VERSION.bff $objdir/contrib/aix
-else
-       mv ../$PKGNAME-$VERSION.bff $objdir
-fi
-
+mv ../$PKGNAME-$VERSION.bff $startdir
+cd $startdir
 rm -rf $objdir/$PKGDIR
 
 echo $0: done.