[PATCH] fix install-strip target in Makefile

Greg Louis glouis at dynamicro.on.ca
Wed Mar 13 22:52:36 EST 2002


The first patch will make "make install-strip" work.  The second spends
a few cycles avoiding "1 files to consider."  Both are trivial but IMHO
useful.

--- Makefile.orig	Wed Mar 13 06:38:42 2002
+++ Makefile	Wed Mar 13 06:40:58 2002
@@ -12,6 +12,7 @@
 LDFLAGS=
 
 INSTALLCMD=/bin/install -c
+INSTALLMAN=/bin/install -c
 
 srcdir=.
 
@@ -56,8 +57,8 @@
 	${INSTALLCMD} -m 755 rsync ${bindir}
 	-mkdir -p ${mandir}/man1
 	-mkdir -p ${mandir}/man5
-	${INSTALLCMD} -m 644 $(srcdir)/rsync.1 ${mandir}/man1
-	${INSTALLCMD} -m 644 $(srcdir)/rsyncd.conf.5 ${mandir}/man5
+	${INSTALLMAN} -m 644 $(srcdir)/rsync.1 ${mandir}/man1
+	${INSTALLMAN} -m 644 $(srcdir)/rsyncd.conf.5 ${mandir}/man5
 
 install-strip:
 	$(MAKE) INSTALLCMD='$(INSTALLCMD) -s' install

--- flist.c.orig	Sun Feb  3 07:08:14 2002
+++ flist.c	Sun Feb  3 07:00:22 2002
@@ -89,8 +89,8 @@
 {
 	if (verbose && recurse && !am_server) {
 		/* This overwrites the progress line, if any. */
-		rprintf(FINFO, RSYNC_NAME ": %d files to consider.\n",
-			flist->count);
+		rprintf(FINFO, RSYNC_NAME ": %d file%sto consider.\n",
+			flist->count, flist->count==1?" ":"s ");
 	}
 }
 



-- 
| G r e g  L o u i s          | gpg public key:      |
|   http://www.bgl.nu/~glouis |   finger greg at bgl.nu |




More information about the rsync mailing list