summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2008-06-27 12:56:20 +1000
committerAndrew Bartlett <abartlet@samba.org>2008-06-27 12:56:20 +1000
commit7ca0386d0b9937ed7142027092302a4b98400e1a (patch)
treefc4318d87c214ca9ea71711ed85279a66ad3a344
parent7a295c66c056bc6eeb26d2176584fff4152b90b8 (diff)
downloadsamba-7ca0386d0b9937ed7142027092302a4b98400e1a.tar.gz
samba-7ca0386d0b9937ed7142027092302a4b98400e1a.tar.bz2
samba-7ca0386d0b9937ed7142027092302a4b98400e1a.zip
Fix installation of Samba4 into an empty tree.
Jelmer's previous patch failed because sh is very fussy about it's syntax, but only compaled in this case if you take the 'no existing binary' path. Andrew Bartlett (This used to be commit 9cb5327ac9811b3c1309d0e4082da3f54ab2a050)
-rw-r--r--source4/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/Makefile b/source4/Makefile
index 3c2efe35af..e43ccf7731 100644
--- a/source4/Makefile
+++ b/source4/Makefile
@@ -249,14 +249,14 @@ uninstallmisc::
$(DESTDIR)$(bindir)/%: bin/% installdirs
@mkdir -p $(@D)
@echo Installing $(@F) as $@
- @if test -f $@; then; rm -f $@.old; mv $@ $@.old; fi
+ @if test -f $@; then echo -n ""; rm -f $@.old; mv $@ $@.old; fi
@cp $< $@
@chmod $(INSTALLPERMS) $@
$(DESTDIR)$(sbindir)/%: bin/% installdirs
@mkdir -p $(@D)
@echo Installing $(@F) as $@
- @if test -f $@; then; rm -f $@.old; mv $@ $@.old; fi
+ @if test -f $@; then echo -n ""; rm -f $@.old; mv $@ $@.old; fi
@cp $< $@
@chmod $(INSTALLPERMS) $@