diff options
| author | Lars Müller <lmuelle@samba.org> | 2006-02-22 21:41:14 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:10:20 -0500 |
| commit | ca0e155ef015adfaf6a9c38518e8d60adcc3fdf9 (patch) | |
| tree | 6523ffbc460d0ed56f6c3b57f05f27ba7704587d /source3/script/installbin.sh | |
| parent | 202bc164ca11539a62a7e894330265df90319828 (diff) | |
| download | samba-ca0e155ef015adfaf6a9c38518e8d60adcc3fdf9.tar.gz samba-ca0e155ef015adfaf6a9c38518e8d60adcc3fdf9.tar.bz2 samba-ca0e155ef015adfaf6a9c38518e8d60adcc3fdf9.zip | |
r13642: Fix install* scripts to use DESTDIR.
Always pass the INSTALLPERMS and DESTDIR as first and second arg to the
scripts.
No longer prepend DESTDIR to the remaining args.
To fix bug #3282 it is important _not_ to prepend DESTDIR to the source
of the sym link pointing to smbmount.
(This used to be commit c38adf71317f2c898ee10cad8068e942835199c9)
Diffstat (limited to 'source3/script/installbin.sh')
| -rwxr-xr-x | source3/script/installbin.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/script/installbin.sh b/source3/script/installbin.sh index f9fd5298c0..2f15ce595a 100755 --- a/source3/script/installbin.sh +++ b/source3/script/installbin.sh @@ -15,13 +15,13 @@ shift for p in $*; do p2=`basename $p` - echo Installing $p as $BINDIR/$p2 - if [ -f $BINDIR/$p2 ]; then - rm -f $BINDIR/$p2.old - mv $BINDIR/$p2 $BINDIR/$p2.old + 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 $BINDIR/ - chmod $INSTALLPERMS $BINDIR/$p2 + 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 |