From a234b822d4adf22df00349905401deb4349935ac Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Thu, 2 Oct 2003 21:22:58 +0000
Subject: fixed for /sbin/mount.smbfs link when using $DESTDIR; bug 525 (This
 used to be commit dc6d14c2bd1a8509e40c198065b8dc930c37d3ed)

---
 source3/Makefile.in          |  4 ++--
 source3/script/installbin.sh | 15 ++++++++++-----
 2 files changed, 12 insertions(+), 7 deletions(-)

(limited to 'source3')

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 0ea2c4411f..4d2845cf6e 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1180,8 +1180,8 @@ installservers: all installdirs
 	@$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(VARDIR) $(SBIN_PROGS)
 
 installbin: all installdirs
-	@$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(VARDIR) $(SBIN_PROGS)
-	@$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(VARDIR) $(BIN_PROGS)
+	@$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(DESTDIR) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(VARDIR) $(SBIN_PROGS)
+	@$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(DESTDIR) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(VARDIR) $(BIN_PROGS)
 
 
 installmodules: modules installdirs
diff --git a/source3/script/installbin.sh b/source3/script/installbin.sh
index c2f34082dd..fe3bc4c48a 100755
--- a/source3/script/installbin.sh
+++ b/source3/script/installbin.sh
@@ -1,10 +1,12 @@
 #!/bin/sh
 
 INSTALLPERMS=$1
-BASEDIR=$2
-BINDIR=$3
-LIBDIR=$4
-VARDIR=$5
+DESTDIR=$2
+BASEDIR=$3
+BINDIR=$4
+LIBDIR=$5
+VARDIR=$6
+shift
 shift
 shift
 shift
@@ -23,7 +25,10 @@ for p in $*; do
 
  # this is a special case, mount needs this in a specific location
  if [ $p2 = smbmount ]; then
-   ln -sf $BINDIR/$p2 /sbin/mount.smbfs
+   if [ ! -d $DESTDIR/sbin ]; then
+      mkdir $DESTDIR/sbin
+   fi 
+   ln -sf $BINDIR/$p2 $DESTDIR/sbin/mount.smbfs
  fi
 done
 
-- 
cgit