diff options
| author | Tim Potter <tpot@samba.org> | 2003-10-09 06:29:50 +0000 |
|---|---|---|
| committer | Tim Potter <tpot@samba.org> | 2003-10-09 06:29:50 +0000 |
| commit | 79ae690ff55b5bd41dee0d6f91be614a2c1474a7 (patch) | |
| tree | 0daf2428c3ac14e2e8761896fc7e7c64eac7f3c4 /source3 | |
| parent | 58153961e4dce5fe74f78bfebdf847d349369376 (diff) | |
| download | samba-79ae690ff55b5bd41dee0d6f91be614a2c1474a7.tar.gz samba-79ae690ff55b5bd41dee0d6f91be614a2c1474a7.tar.bz2 samba-79ae690ff55b5bd41dee0d6f91be614a2c1474a7.zip | |
Merge from 3.0:
>cosmetic fix when DESTDIR=/ (default)
>fixed for /sbin/mount.smbfs link when using $DESTDIR; bug 525
(This used to be commit 27e8f16188b5db96ae191b2e6ad9948e46d6d9b1)
Diffstat (limited to 'source3')
| -rwxr-xr-x | source3/script/installbin.sh | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/source3/script/installbin.sh b/source3/script/installbin.sh index c2f34082dd..f9fd5298c0 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=`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 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 |