* remake-hdr.am (@STAMP@): Reverted timestamp change.

	($(srcdir)/@STAMP@.in): Likewise.

diff --git a/ChangeLog b/ChangeLog
index b9ec45dcc411f0d7c740679a27a7aefb661d4271..07282866cfcdff02546345f538007f8968da49ab 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1999-01-11  Tom Tromey  <tromey@cygnus.com>
+
+       * remake-hdr.am (@STAMP@): Reverted timestamp change.
+       ($(srcdir)/@STAMP@.in): Likewise.
+
 1999-01-10  Tom Tromey  <tromey@cygnus.com>
 
        * Makefile.am (scriptdir): New macro.

diff --git a/lib/am/remake-hdr.am b/lib/am/remake-hdr.am
index d6a144e6b6ec422c9aec2393b1a2f7ff6586aebd..90712da01b27fea69109820f95b84f4fa689be33 100644 (file)
--- 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 d6a144e6b6ec422c9aec2393b1a2f7ff6586aebd..90712da01b27fea69109820f95b84f4fa689be33 100644 (file)
--- 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