From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 25 Aug 2007 10:59:32 +0000 (+0000)
Subject: (rcs2log, rcs-checkin, grep-changelog, vcdiff): Prepend "-" to the command,
X-Git-Tag: emacs-pretest-22.1.90~912
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ca4ea90fa9fddeaa15956d0eeac068ac01bd1e33;p=emacs.git

(rcs2log, rcs-checkin, grep-changelog, vcdiff): Prepend "-" to the command,
in case srcdir=. and file is copied into itself.
---

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index f26845c6c62..fca9e1c2e66 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,9 @@
+2007-08-25  Eli Zaretskii  <eliz@gnu.org>
+
+	* Makefile.in (rcs2log, rcs-checkin, grep-changelog, vcdiff):
+	Prepend "-" to the command, in case srcdir=. and file is copied
+	into itself.
+
 2007-07-25  Glenn Morris  <rgm@gnu.org>
 
 	* Relicense all FSF files to GPLv3 or later.
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 1482ea6c5df..5d8da71dbdd 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -268,18 +268,21 @@ BASE_CFLAGS = C_SWITCH_SYSTEM C_SWITCH_MACHINE -DHAVE_CONFIG_H \
 all: ${DONT_INSTALL} ${UTILITIES} ${INSTALLABLES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS}
 
 /* These targets copy the scripts into the build directory
-so that they can be run from there in an uninstalled Emacs.  */
+so that they can be run from there in an uninstalled Emacs.
+The "-" is prepended because some versions of cp barf when
+srcdir is the current directory, and thus the file will be
+copied into itself.  */
 rcs2log: $(srcdir)/rcs2log
-	cp -p $(srcdir)/rcs2log rcs2log
+	-cp -p $(srcdir)/rcs2log rcs2log
 
 rcs-checkin: $(srcdir)/rcs-checkin
-	cp -p $(srcdir)/rcs-checkin rcs-checkin
+	-cp -p $(srcdir)/rcs-checkin rcs-checkin
 
 grep-changelog: $(srcdir)/grep-changelog
-	cp -p $(srcdir)/grep-changelog grep-changelog
+	-cp -p $(srcdir)/grep-changelog grep-changelog
 
 vcdiff: $(srcdir)/vcdiff
-	cp -p $(srcdir)/vcdiff vcdiff
+	-cp -p $(srcdir)/vcdiff vcdiff
 
 #ifdef MOVEMAIL_NEEDS_BLESSING
 blessmail: