From 6aaf8d8c1041b524d985bf09b9a3f5e371cf8ac2 Mon Sep 17 00:00:00 2001
From: Martin Pool <mbp@samba.org>
Date: Wed, 20 Mar 2002 05:53:40 +0000
Subject: [PATCH]     * Make "make install-strip" works properly, and "make
 install"       accepts a DESTDIR variable for help in building binary
 packages.       (Peter Breitenlohner)

---
 Makefile.in | 14 +++++++-------
 NEWS        |  5 +++++
 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
-- 
2.34.1