From 24decd1233da03e4ce77e2110e7d06a368924164 Mon Sep 17 00:00:00 2001
From: Lars Müller <lmuelle@samba.org>
Date: Wed, 8 Mar 2006 21:42:12 +0000
Subject: 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)
---
 source3/script/installbin.sh      | 40 ----------------------------------
 source3/script/installbin.sh.in   | 42 +++++++++++++++++++++++++++++++++++
 source3/script/uninstallbin.sh    | 44 -------------------------------------
 source3/script/uninstallbin.sh.in | 46 +++++++++++++++++++++++++++++++++++++++
 4 files changed, 88 insertions(+), 84 deletions(-)
 delete mode 100755 source3/script/installbin.sh
 create mode 100755 source3/script/installbin.sh.in
 delete mode 100755 source3/script/uninstallbin.sh
 create mode 100755 source3/script/uninstallbin.sh.in

(limited to 'source3/script')

diff --git a/source3/script/installbin.sh b/source3/script/installbin.sh
deleted file mode 100755
index 8859c95341..0000000000
--- a/source3/script/installbin.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-
-INSTALLPERMS=$1
-DESTDIR=$2
-BINDIR=`echo $3 | sed 's/\/\//\//g'`
-shift
-shift
-shift
-
-for p in $*; do
- p2=`basename $p`
- echo "Installing $p as $DESTDIR/$BINDIR/$p2 "
- if [ -f $DESTDIR/$BINDIR/$p2 ]; then
-   rm -f $DESTDIR/$BINDIR/$p2.old
-   mv $DESTDIR/$BINDIR/$p2 $DESTDIR/$BINDIR/$p2.old
- fi
- cp $p $DESTDIR/$BINDIR/
- chmod $INSTALLPERMS $DESTDIR/$BINDIR/$p2
-
- # this is a special case, mount needs this in a specific location
- if [ $p2 = smbmount ]; then
-   if [ ! -d $DESTDIR/sbin ]; then
-      mkdir $DESTDIR/sbin
-   fi
-   echo "Creating sym link $DESTDIR/sbin/mount.smbfs to $BINDIR/$p2 "
-   ln -sf $BINDIR/$p2 $DESTDIR/sbin/mount.smbfs
- fi
-done
-
-
-cat << EOF
-======================================================================
-The binaries are installed. You may restore the old binaries (if there
-were any) using the command "make revert". You may uninstall the binaries
-using the command "make uninstallbin" or "make uninstall" to uninstall
-binaries, man pages and shell scripts.
-======================================================================
-EOF
-
-exit 0
diff --git a/source3/script/installbin.sh.in b/source3/script/installbin.sh.in
new file mode 100755
index 0000000000..6c578b3971
--- /dev/null
+++ b/source3/script/installbin.sh.in
@@ -0,0 +1,42 @@
+#!/bin/sh
+
+INSTALLPERMS=$1
+DESTDIR=$2
+prefix=`echo $3 | sed 's/\/\//\//g'`
+BINDIR=`echo $4 | sed 's/\/\//\//g'`
+shift
+shift
+shift
+shift
+
+for p in $*; do
+ p2=`basename $p`
+ echo "Installing $p as $DESTDIR/$BINDIR/$p2 "
+ if [ -f $DESTDIR/$BINDIR/$p2 ]; then
+   rm -f $DESTDIR/$BINDIR/$p2.old
+   mv $DESTDIR/$BINDIR/$p2 $DESTDIR/$BINDIR/$p2.old
+ fi
+ cp $p $DESTDIR/$BINDIR/
+ chmod $INSTALLPERMS $DESTDIR/$BINDIR/$p2
+
+ # this is a special case, mount needs this in a specific location
+ if [ $p2 = smbmount ]; then
+   if [ ! -d $DESTDIR/@rootsbindir@ ]; then
+      mkdir $DESTDIR/@rootsbindir@
+   fi
+   echo "Creating sym link $DESTDIR/@rootsbindir@/mount.smbfs to $BINDIR/$p2 "
+   ln -sf $BINDIR/$p2 $DESTDIR/@rootsbindir@/mount.smbfs
+ fi
+done
+
+
+cat << EOF
+======================================================================
+The binaries are installed. You may restore the old binaries (if there
+were any) using the command "make revert". You may uninstall the binaries
+using the command "make uninstallbin" or "make uninstall" to uninstall
+binaries, man pages and shell scripts.
+======================================================================
+EOF
+
+exit 0
diff --git a/source3/script/uninstallbin.sh b/source3/script/uninstallbin.sh
deleted file mode 100755
index 5d39b79882..0000000000
--- a/source3/script/uninstallbin.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-#4 July 96 Dan.Shearer@UniSA.edu.au   
-
-INSTALLPERMS=$1
-DESTDIR=$2
-BINDIR=`echo $3 | sed 's/\/\//\//g'`
-shift
-shift
-shift
-
-if [ ! -d $DESTDIR/$BINDIR ]; then
-  echo "Directory $DESTDIR/$BINDIR does not exist! "
-  echo "Do a "make installbin" or "make install" first. "
-  exit 1
-fi
-
-for p in $*; do
-  p2=`basename $p`
-  if [ -f $DESTDIR/$BINDIR/$p2 ]; then
-    echo "Removing $DESTDIR/$BINDIR/$p2 "
-    rm -f $DESTDIR/$BINDIR/$p2
-    if [ -f $DESTDIR/$BINDIR/$p2 ]; then
-      echo "Cannot remove $DESTDIR/$BINDIR/$p2 ... does $USER have privileges? "
-    fi
-  fi
-
-  # 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"
-  fi
-done
-
-
-cat << EOF
-======================================================================
-The binaries have been uninstalled. You may restore the binaries using
-the command "make installbin" or "make install" to install binaries, 
-man pages, modules and shell scripts. You can restore a previous
-version of the binaries (if there were any) using "make revert".
-======================================================================
-EOF
-
-exit 0
diff --git a/source3/script/uninstallbin.sh.in b/source3/script/uninstallbin.sh.in
new file mode 100755
index 0000000000..d8a4855823
--- /dev/null
+++ b/source3/script/uninstallbin.sh.in
@@ -0,0 +1,46 @@
+#!/bin/sh
+#4 July 96 Dan.Shearer@UniSA.edu.au   
+
+INSTALLPERMS=$1
+DESTDIR=$2
+prefix=`echo $3 | sed 's/\/\//\//g'`
+BINDIR=`echo $4 | sed 's/\/\//\//g'`
+shift
+shift
+shift
+shift
+
+if [ ! -d $DESTDIR/$BINDIR ]; then
+  echo "Directory $DESTDIR/$BINDIR does not exist! "
+  echo "Do a "make installbin" or "make install" first. "
+  exit 1
+fi
+
+for p in $*; do
+  p2=`basename $p`
+  if [ -f $DESTDIR/$BINDIR/$p2 ]; then
+    echo "Removing $DESTDIR/$BINDIR/$p2 "
+    rm -f $DESTDIR/$BINDIR/$p2
+    if [ -f $DESTDIR/$BINDIR/$p2 ]; then
+      echo "Cannot remove $DESTDIR/$BINDIR/$p2 ... does $USER have privileges? "
+    fi
+  fi
+
+  # 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/@rootsbindir@/sbin/mount.smbfs"
+  fi
+done
+
+
+cat << EOF
+======================================================================
+The binaries have been uninstalled. You may restore the binaries using
+the command "make installbin" or "make install" to install binaries, 
+man pages, modules and shell scripts. You can restore a previous
+version of the binaries (if there were any) using "make revert".
+======================================================================
+EOF
+
+exit 0
-- 
cgit