From aafaff1309f1f4d91c580f4740ac20e81f117b4c Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 11 Jan 1999 13:46:47 +0000 Subject: [PATCH] * remake-hdr.am (@STAMP@): Reverted timestamp change. ($(srcdir)/@STAMP@.in): Likewise. --- ChangeLog | 5 +++++ lib/am/remake-hdr.am | 12 ++++++------ remake-hdr.am | 12 ++++++------ 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index b9ec45dc..07282866 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +1999-01-11 Tom Tromey + + * remake-hdr.am (@STAMP@): Reverted timestamp change. + ($(srcdir)/@STAMP@.in): Likewise. + 1999-01-10 Tom Tromey * Makefile.am (scriptdir): New macro. diff --git a/lib/am/remake-hdr.am b/lib/am/remake-hdr.am index d6a144e6..90712da0 100644 --- a/lib/am/remake-hdr.am +++ b/lib/am/remake-hdr.am @@ -26,9 +26,9 @@ cd $(top_builddir) \ && CONFIG_FILES= CONFIG_HEADERS=@CONFIG_HEADER_FULL@ \ $(SHELL) ./config.status -## Try to get a real timestamp; this is useful for CVS - @(date || ls -l @CONFIG_HEADER@ || echo timestamp) \ - > @STAMP@ 2> /dev/null +## We used to try to get a real timestamp here. But the fear is that +## that will cause unnecessary cvs conflicts + @echo timestamp > @STAMP@ 2> /dev/null ## Explicitly look in srcdir for benefit of non-GNU makes. $(srcdir)/@CONFIG_HEADER_IN@: @MAINTAINER_MODE_TRUE@$(srcdir)/@STAMP@.in ## Recover from removal of CONFIG_HEADER_IN @@ -38,6 +38,6 @@ $(srcdir)/@CONFIG_HEADER_IN@: @MAINTAINER_MODE_TRUE@$(srcdir)/@STAMP@.in else :; fi $(srcdir)/@STAMP@.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) @FILES@ cd $(top_srcdir) && $(AUTOHEADER) -## Try to get a real timestamp; this is useful for CVS - @(date || ls -l $(srcdir)/@CONFIG_HEADER_IN@ || echo timestamp) \ - > $(srcdir)/@STAMP@.in 2> /dev/null +## We used to try to get a real timestamp here. But the fear is that +## that will cause unnecessary cvs conflicts + @echo timestamp > $(srcdir)/@STAMP@.in 2> /dev/null diff --git a/remake-hdr.am b/remake-hdr.am index d6a144e6..90712da0 100644 --- a/remake-hdr.am +++ b/remake-hdr.am @@ -26,9 +26,9 @@ cd $(top_builddir) \ && CONFIG_FILES= CONFIG_HEADERS=@CONFIG_HEADER_FULL@ \ $(SHELL) ./config.status -## Try to get a real timestamp; this is useful for CVS - @(date || ls -l @CONFIG_HEADER@ || echo timestamp) \ - > @STAMP@ 2> /dev/null +## We used to try to get a real timestamp here. But the fear is that +## that will cause unnecessary cvs conflicts + @echo timestamp > @STAMP@ 2> /dev/null ## Explicitly look in srcdir for benefit of non-GNU makes. $(srcdir)/@CONFIG_HEADER_IN@: @MAINTAINER_MODE_TRUE@$(srcdir)/@STAMP@.in ## Recover from removal of CONFIG_HEADER_IN @@ -38,6 +38,6 @@ $(srcdir)/@CONFIG_HEADER_IN@: @MAINTAINER_MODE_TRUE@$(srcdir)/@STAMP@.in else :; fi $(srcdir)/@STAMP@.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) @FILES@ cd $(top_srcdir) && $(AUTOHEADER) -## Try to get a real timestamp; this is useful for CVS - @(date || ls -l $(srcdir)/@CONFIG_HEADER_IN@ || echo timestamp) \ - > $(srcdir)/@STAMP@.in 2> /dev/null +## We used to try to get a real timestamp here. But the fear is that +## that will cause unnecessary cvs conflicts + @echo timestamp > $(srcdir)/@STAMP@.in 2> /dev/null -- 2.43.5