cosmetic fix when DESTDIR=/ (default)

(This used to be commit e660b5752aa129c49b0b665845de2fe4c160be00)

diff --git a/source3/script/installbin.sh b/source3/script/installbin.sh
index fe3bc4c48ae61139cef4446cad6c2f9f3969ce72..f9fd5298c0972f303fb4599208e3ccb6515508dd 100755 (executable)
--- a/source3/script/installbin.sh
+++ b/source3/script/installbin.sh
@@ -2,10 +2,10 @@
 
 INSTALLPERMS=$1
 DESTDIR=$2
-BASEDIR=$3
-BINDIR=$4
-LIBDIR=$5
-VARDIR=$6
+BASEDIR=`echo $3 | sed 's/\/\//\//g'`
+BINDIR=`echo $4 | sed 's/\/\//\//g'`
+LIBDIR=`echo $5 | sed 's/\/\//\//g'`
+VARDIR=`echo $6 | sed 's/\/\//\//g'`
 shift
 shift
 shift

diff --git a/source3/script/installdat.sh b/source3/script/installdat.sh
index 7ff88ac788e5a574966b8a14131ba748eb61524f..4a5b1de5dc86921ce0a1aad2bda04cce9a0b5893 100755 (executable)
--- a/source3/script/installdat.sh
+++ b/source3/script/installdat.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 #fist version March 2002, Herb  Lewis
 
-DATDIR=$1
+DATDIR=`echo $1 | sed 's/\/\//\//g'`
 SRCDIR=$2/
 
 echo Installing dat files in $DATDIR

diff --git a/source3/script/installdirs.sh b/source3/script/installdirs.sh
index 9557b86d3bc401fdcf39b7a4112430d210f17568..1db46b82ff2f5cf194f3758c9bd91e5a0cf22f56 100755 (executable)
--- a/source3/script/installdirs.sh
+++ b/source3/script/installdirs.sh
@@ -1,11 +1,13 @@
 #!/bin/sh
 
 while ( test -n "$1" ); do
-       if [ ! -d $1 ]; then
-               mkdir -p $1
+
+       DIRNAME=`echo $1 | sed 's/\/\//\//g'`
+       if [ ! -d $DIRNAME ]; then
+               mkdir -p $DIRNAME
        fi
 
-       if [ ! -d $1 ]; then
+       if [ ! -d $DIRNAME ]; then
                echo Failed to make directory $1
                exit 1
        fi

diff --git a/source3/script/installman.sh b/source3/script/installman.sh
index 5b6bba69edbfb09bbe5aab2863894ffc8f4aa447..c7a8f45095144cc3b04e6a0f4fde543b45464ea4 100755 (executable)
--- a/source3/script/installman.sh
+++ b/source3/script/installman.sh
@@ -5,7 +5,7 @@
 #   modified to accomodate international man pages (inspired
 #   by Japanese edition's approach)
 
-MANDIR=$1
+MANDIR=`echo $1 | sed 's/\/\//\//g'`
 SRCDIR=$2/
 langs=$3
 

diff --git a/source3/script/installmodules.sh b/source3/script/installmodules.sh
index c80da763688fdad5e705ed2b019dab3eea5f8752..f7c74733381bebbf7affc88f054cc7d468a2b55c 100755 (executable)
--- a/source3/script/installmodules.sh
+++ b/source3/script/installmodules.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 INSTALLPERMS=$1
-BASEDIR=$2
-LIBDIR=$3
+BASEDIR=`echo $2 | sed 's/\/\//\//g'`
+LIBDIR=`echo $3 | sed 's/\/\//\//g'`
 shift
 shift
 shift

diff --git a/source3/script/installmsg.sh b/source3/script/installmsg.sh
index 30ad404aa0d8553360c9ae50fc978214ed3e2c18..5a41fe1ca8db93d2e4acc165ea9f5c8156f414b0 100644 (file)
--- a/source3/script/installmsg.sh
+++ b/source3/script/installmsg.sh
@@ -2,7 +2,7 @@
 # first version (Sept 2003) written by Shiro Yamada <shiro@miraclelinux.com>
 # based on the first verion (March 2002) of installdat.sh written by Herb Lewis
 
-MSGDIR=$1
+MSGDIR=`echo $1 | sed 's/\/\//\//g'`
 SRCDIR=$2/
 
 echo Installing msg files in $MSGDIR

diff --git a/source3/script/installscripts.sh b/source3/script/installscripts.sh
index bff5423e7cb3b52c52cd59e8495b1a2a7434d569..81608c3682c2beff25fe7059f8248d2eca28c509 100755 (executable)
--- a/source3/script/installscripts.sh
+++ b/source3/script/installscripts.sh
@@ -3,7 +3,7 @@
 # 5 July 96 Dan.Shearer@UniSA.Edu.Au  Don't hardcode script names, get from Make
 
 INSTALLPERMS=$1
-BINDIR=$2
+BINDIR=`echo $2 | sed 's/\/\//\//g'`
 
 shift
 shift

diff --git a/source3/script/installswat.sh b/source3/script/installswat.sh
index bd2f8da2348f941d70a509a1fa18b3c4015a06d5..7841a2a7b505a299c979f8f8e7ea855bafe72fab 100755 (executable)
--- a/source3/script/installswat.sh
+++ b/source3/script/installswat.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 #first version March 1998, Andrew Tridgell
 
-SWATDIR=$1
+SWATDIR=`echo $1 | sed 's/\/\//\//g'`
 SRCDIR=$2/
 BOOKDIR=$SWATDIR/using_samba
 

diff --git a/source3/script/uninstallbin.sh b/source3/script/uninstallbin.sh
index a8bbdea7afdfe983c89fb89f2c621c4ac45105da..5de936fccfd3d3e5e750fca0116368a76bc1c8b9 100755 (executable)
--- a/source3/script/uninstallbin.sh
+++ b/source3/script/uninstallbin.sh
@@ -2,10 +2,10 @@
 #4 July 96 Dan.Shearer@UniSA.edu.au   
 
 INSTALLPERMS=$1
-BASEDIR=$2
-BINDIR=$3
-LIBDIR=$4
-VARDIR=$5
+BASEDIR=`echo $2 | sed 's/\/\//\//g'`
+BINDIR=`echo $3 | sed 's/\/\//\//g'`
+LIBDIR=`echo $4 | sed 's/\/\//\//g'`
+VARDIR=`echo $5 | sed 's/\/\//\//g'`
 shift
 shift
 shift

diff --git a/source3/script/uninstallman.sh b/source3/script/uninstallman.sh
index 3126709831f591f9f46332b09897964a5683f5ed..0fea11cd1b2287e125de8ff06e8fd6bc249e2d96 100755 (executable)
--- a/source3/script/uninstallman.sh
+++ b/source3/script/uninstallman.sh
@@ -6,7 +6,7 @@
 #   by Japanese edition's approach)
 
 
-MANDIR=$1
+MANDIR=`echo $1 | sed 's/\/\//\//g'`
 SRCDIR=$2
 langs=$3
 

diff --git a/source3/script/uninstallmodules.sh b/source3/script/uninstallmodules.sh
index 30582a39fac24a41aa71a5ad18eb9e4bda1eb6d7..ac83af3dc9057aa006c93f2f965bdfa712f62719 100755 (executable)
--- a/source3/script/uninstallmodules.sh
+++ b/source3/script/uninstallmodules.sh
@@ -2,8 +2,8 @@
 #4 July 96 Dan.Shearer@UniSA.edu.au   
 
 INSTALLPERMS=$1
-BASEDIR=$2
-LIBDIR=$3
+BASEDIR=`echo $2 | sed 's/\/\//\//g'`
+LIBDIR=`echo $3 | sed 's/\/\//\//g'`
 shift
 shift
 shift

diff --git a/source3/script/uninstallscripts.sh b/source3/script/uninstallscripts.sh
index 13104acedd8ee9f14c62dcbd3bd29b6b988fc57e..cf7fd71999372efa92f55e84bc0857c1336b6901 100755 (executable)
--- a/source3/script/uninstallscripts.sh
+++ b/source3/script/uninstallscripts.sh
@@ -2,7 +2,7 @@
 # 5 July 96 Dan.Shearer@UniSA.Edu.Au  - almost identical to uninstallbin.sh
 
 INSTALLPERMS=$1
-BINDIR=$2
+BINDIR=`echo $2 | sed 's/\/\//\//g'`
 
 shift
 shift