4 files changed, 19 insertions, 14 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 72ac147d56..6f3882baaf 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1405,14 +1405,14 @@ installdirs:
 	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS) $(DESTDIR) $(prefix) $(BINDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(PRIVATEDIR) $(PIDDIR) $(LOCKDIR) $(MANDIR)
 
 installservers: all installdirs
-	@$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(DESTDIR) $(SBINDIR) $(SBIN_PROGS)
+	@$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(DESTDIR) $(prefix) $(SBINDIR) $(SBIN_PROGS)
 
 installbin: all installdirs
-	@$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(DESTDIR) $(BINDIR) $(BIN_PROGS)
+	@$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(DESTDIR) $(prefix) $(BINDIR) $(BIN_PROGS)
 
 installcifsmount: @CIFSMOUNT_PROGS@
 	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS) $(DESTDIR) $(ROOTSBINDIR)
-	@$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(DESTDIR) $(ROOTSBINDIR) @CIFSMOUNT_PROGS@
+	@$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(DESTDIR) $(prefix) $(ROOTSBINDIR) @CIFSMOUNT_PROGS@
 
 # Some symlinks are required for the 'probing' of modules. 
 # This mechanism should go at some point..
@@ -1517,13 +1517,13 @@ uninstallman:
 	@$(SHELL) $(srcdir)/script/uninstallman.sh $(DESTDIR)$(MANDIR) $(srcdir) C
 
 uninstallservers:
-	@$(SHELL) $(srcdir)/script/uninstallbin.sh $(INSTALLPERMS) $(DESTDIR) $(SBINDIR) $(SBIN_PROGS)
+	@$(SHELL) $(srcdir)/script/uninstallbin.sh $(INSTALLPERMS) $(DESTDIR) $(prefix) $(SBINDIR) $(SBIN_PROGS)
 
 uninstallbin:
-	@$(SHELL) $(srcdir)/script/uninstallbin.sh $(INSTALLPERMS) $(DESTDIR) $(BINDIR) $(BIN_PROGS)
+	@$(SHELL) $(srcdir)/script/uninstallbin.sh $(INSTALLPERMS) $(DESTDIR) $(prefix) $(BINDIR) $(BIN_PROGS)
 
 uninstallcifsmount:
-	@$(SHELL) $(srcdir)/script/uninstallbin.sh $(INSTALLPERMS) $(DESTDIR) $(ROOTSBINDIR) @CIFSMOUNT_PROGS@
+	@$(SHELL) $(srcdir)/script/uninstallbin.sh $(INSTALLPERMS) $(DESTDIR) $(prefix) $(ROOTSBINDIR) @CIFSMOUNT_PROGS@
 
 uninstallmodules:
 	@$(SHELL) $(srcdir)/script/uninstallmodules.sh $(INSTALLPERMS) $(DESTDIR) $(prefix) $(VFSLIBDIR) $(VFS_MODULES)
@@ -1651,6 +1651,7 @@ ctags:
 
 realclean: clean delheaders
 	-rm -f config.log bin/.dummy script/findsmb
+	-rm -f script/installbin.sh script/uninstallbin.sh
 
 distclean: realclean
 	-rm -f include/stamp-h
diff --git a/source3/configure.in b/source3/configure.in
index 967a4ae2fd..6afae94810 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -5362,7 +5362,7 @@ dnl Remove -I/usr/include/? from CFLAGS and CPPFLAGS
 CFLAGS_REMOVE_USR_INCLUDE(CFLAGS)
 CFLAGS_REMOVE_USR_INCLUDE(CPPFLAGS)
 
-AC_OUTPUT(include/stamp-h Makefile script/findsmb smbadduser script/gen-8bit-gap.sh)
+AC_OUTPUT(include/stamp-h Makefile script/findsmb smbadduser script/gen-8bit-gap.sh script/installbin.sh script/uninstallbin.sh)
 
 #################################################
 # Print very concise instructions on building/use
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