From 67163749cc44f81f157fce9b63aa718dc5f49538 Mon Sep 17 00:00:00 2001
From: Glenn Morris <rgm@gnu.org>
Date: Tue, 5 Jun 2012 21:38:04 -0400
Subject: [PATCH] Remove script stamping in lib-src/

rcs2log no longer needs it, and grep-changelog never really has
(nothing in Emacs runs that, I don't know why Emacs includes it, if you
are using an uninstalled out-of-tree build you can just as easily run
it from the source directory).

* lib-src/Makefile.in (STAMP_INST_SCRIPTS, STAMP_SCRIPTS, insrcdir)
(stamp-rcs2log, stamp-grep-changelog): Remove.
(all, clean): Remove references to stamps.

* .bzrignore: Do not ignore lib-src/stamp*.
---
 lib-src/ChangeLog   |  4 ++++
 lib-src/Makefile.in | 18 +-----------------
 2 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index a1cdb53649..b6f5c3ead6 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,5 +1,9 @@
 2012-06-06  Glenn Morris  <rgm@gnu.org>
 
+	* Makefile.in (STAMP_INST_SCRIPTS, STAMP_SCRIPTS, insrcdir)
+	(stamp-rcs2log, stamp-grep-changelog): Remove.
+	(all, clean): Remove references to stamps.
+
 	* vcdiff: Remove file.
 	* Makefile.in (SCRIPTS, STAMP_SCRIPTS): Remove vcdiff.
 	(stamp-vcdiff): Remove.
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 136045a9cd..2df22d9f7d 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -118,7 +118,6 @@ INSTALLABLES = etags${EXEEXT} ctags${EXEEXT} emacsclient${EXEEXT} \
                ebrowse${EXEEXT}
 
 INSTALLABLE_SCRIPTS = grep-changelog
-STAMP_INST_SCRIPTS = stamp-grep-changelog
 
 # Things that Emacs runs internally, or during the build process,
 #  which should not be installed in bindir.
@@ -130,7 +129,6 @@ DONT_INSTALL= test-distrib${EXEEXT} make-docfile${EXEEXT}
 # Like UTILITIES, but they're not system-dependent, and should not be
 #  deleted by the distclean target.
 SCRIPTS= rcs2log
-STAMP_SCRIPTS= stamp-rcs2log
 
 # All files that are created by the linker, i.e., whose names end in ${EXEEXT}.
 EXE_FILES = ${INSTALLABLES} ${UTILITIES} ${DONT_INSTALL}
@@ -181,24 +179,11 @@ ALL_CFLAGS = ${BASE_CFLAGS} ${PROFILING_CFLAGS} ${LDFLAGS} ${CPPFLAGS} ${CFLAGS}
 LINK_CFLAGS = ${BASE_CFLAGS} ${LDFLAGS} ${CFLAGS}
 CPP_CFLAGS = ${BASE_CFLAGS} ${PROFILING_CFLAGS} ${CPPFLAGS} ${CFLAGS}
 
-all: ${EXE_FILES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS} ${STAMP_INST_SCRIPTS} ${STAMP_SCRIPTS}
+all: ${EXE_FILES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS}
 
 LOADLIBES = ../lib/libgnu.a $(LIBS_SYSTEM)
 $(EXE_FILES): ../lib/libgnu.a
 
-## These targets copy the scripts into the build directory so that
-## they can be run from there in an uninstalled Emacs.
-## Nothing to do if pwd = srcdir.
-insrcdir=[ "`/bin/pwd`" = "`cd $(srcdir) && /bin/pwd`" ]
-
-stamp-rcs2log: $(srcdir)/rcs2log
-	$(insrcdir) || cp -p $(srcdir)/rcs2log rcs2log
-	touch $@
-
-stamp-grep-changelog: $(srcdir)/grep-changelog
-	$(insrcdir) || cp -p $(srcdir)/grep-changelog grep-changelog
-	touch $@
-
 ## Only used if we need blessmail, but no harm in always defining.
 ## This makes the actual blessmail executable.
 blessmail:
@@ -273,7 +258,6 @@ mostlyclean:
 
 clean: mostlyclean
 	-rm -f ${EXE_FILES}
-	-rm -f ${STAMP_INST_SCRIPTS} ${STAMP_SCRIPTS}
 
 distclean: clean
 	-rm -f TAGS
-- 
2.20.1