r14056: Also install the mount.smbfs sym link to rootsbindir. Therfore we have

to substitute rootsbindir in {,un}installbin.sh.in.

Pass $prefix as third arg to installbin/ uninstallbin as rootsbindir by
default is $prefix/sbin.
(This used to be commit 7773b8c9e0ad7bcff1312f28ca9cd17d7677e9bd)

2 files changed, 11 insertions, 7 deletions

diff --git a/source3/script/installbin.sh b/source3/script/installbin.sh.in
index 8859c95341..6c578b3971 100755
--- a/source3/script/installbin.sh
+++ b/source3/script/installbin.sh.in
@@ -2,7 +2,9 @@
 
 INSTALLPERMS=$1
 DESTDIR=$2
-BINDIR=`echo $3 | sed 's/\/\//\//g'`
+prefix=`echo $3 | sed 's/\/\//\//g'`
+BINDIR=`echo $4 | sed 's/\/\//\//g'`
+shift
 shift
 shift
 shift
@@ -19,11 +21,11 @@ for p in $*; do
 
  # this is a special case, mount needs this in a specific location
  if [ $p2 = smbmount ]; then
-   if [ ! -d $DESTDIR/sbin ]; then
-      mkdir $DESTDIR/sbin
+   if [ ! -d $DESTDIR/@rootsbindir@ ]; then
+      mkdir $DESTDIR/@rootsbindir@
    fi
-   echo "Creating sym link $DESTDIR/sbin/mount.smbfs to $BINDIR/$p2 "
-   ln -sf $BINDIR/$p2 $DESTDIR/sbin/mount.smbfs
+   echo "Creating sym link $DESTDIR/@rootsbindir@/mount.smbfs to $BINDIR/$p2 "
+   ln -sf $BINDIR/$p2 $DESTDIR/@rootsbindir@/mount.smbfs
  fi
 done
 
diff --git a/source3/script/uninstallbin.sh b/source3/script/uninstallbin.sh.in
index 5d39b79882..d8a4855823 100755
--- a/source3/script/uninstallbin.sh
+++ b/source3/script/uninstallbin.sh.in
@@ -3,7 +3,9 @@
 
 INSTALLPERMS=$1
 DESTDIR=$2
-BINDIR=`echo $3 | sed 's/\/\//\//g'`
+prefix=`echo $3 | sed 's/\/\//\//g'`
+BINDIR=`echo $4 | sed 's/\/\//\//g'`
+shift
 shift
 shift
 shift
@@ -27,7 +29,7 @@ for p in $*; do
   # this is a special case, mount needs this in a specific location
   if test "$p2" = smbmount -a -f "$DESTDIR/sbin/mount.smbfs"; then
     echo "Removing $DESTDIR/sbin/mount.smbfs "
-    rm -f "$DESTDIR/sbin/mount.smbfs"
+    rm -f "$DESTDIR/@rootsbindir@/sbin/mount.smbfs"
   fi
 done