summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.in14
-rw-r--r--NEWS5
2 files changed, 12 insertions, 7 deletions
diff --git a/Makefile.in b/Makefile.in
index 74fe4401..c88a890b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -53,15 +53,15 @@ all: rsync
man: rsync.1 rsyncd.conf.5
install: all
- -mkdir -p ${bindir}
- ${INSTALLCMD} -m 755 rsync ${bindir}
- -mkdir -p ${mandir}/man1
- -mkdir -p ${mandir}/man5
- ${INSTALLMAN} -m 644 $(srcdir)/rsync.1 ${mandir}/man1
- ${INSTALLMAN} -m 644 $(srcdir)/rsyncd.conf.5 ${mandir}/man5
+ -mkdir -p ${DESTDIR}${bindir}
+ ${INSTALLCMD} ${STRIP} -m 755 rsync ${DESTDIR}${bindir}
+ -mkdir -p ${DESTDIR}${mandir}/man1
+ -mkdir -p ${DESTDIR}${mandir}/man5
+ ${INSTALLMAN} -m 644 $(srcdir)/rsync.1 ${DESTDIR}${mandir}/man1
+ ${INSTALLMAN} -m 644 $(srcdir)/rsyncd.conf.5 ${DESTDIR}${mandir}/man5
install-strip:
- $(MAKE) INSTALLCMD='$(INSTALLCMD) -s' install
+ $(MAKE) STRIP='-s' install
rsync: $(OBJS)
@echo "Please ignore warnings below about mktemp -- it is used in a safe way"
diff --git a/NEWS b/NEWS
index ef198c40..6548dd6b 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,11 @@ rsync changes since last release
time taken; otherwise show expected time to complete. (Cameron
Simpson)
+ * Make "make install-strip" works properly, and "make install"
+ accepts a DESTDIR variable for help in building binary packages.
+ (Peter Breitenlohner)
+
+
BUG FIXES:
* Fix situation where failure to fork (e.g. because out of process