A couple bug fixes from Andreas Schwab:

	* texi-vers.am: Use the correct target names.  Fix generation of
	stamp file.
	* automake.in (handle_tests): In commands generating site.exp copy
	the old contents from site.exp, not site.bak, which does not
	exist.

diff --git a/ChangeLog b/ChangeLog
index 8b3d120..36c09ac 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+1998-05-24  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+       * texi-vers.am: Use the correct target names.  Fix generation of
+       stamp file.
+
+       * automake.in (handle_tests): In commands generating site.exp copy
+       the old contents from site.exp, not site.bak, which does not
+       exist.
+
 Tue Sep 29 00:10:22 1998  Tom Tromey  <tromey@cygnus.com>
 
        Fixed noinst.test again:

diff --git a/automake.in b/automake.in
index bf726f7..6b08f8d 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -3803,7 +3803,7 @@ sub handle_tests
            }
 
            $output_rules .= ("\t\@echo '## All variables above are generated by configure. Do Not Edit ##' >> \$\@-t\n"
-                             . "\t-\@sed '1,/^## All variables above are.*##/ d' site.bak >> \$\@-t\n"
+                             . "\t-\@sed '1,/^## All variables above are.*##/ d' site.exp >> \$\@-t\n"
                              . "\t-\@mv site.exp site.bak\n"
                              . "\t\@mv \$\@-t site.exp\n");
        }

diff --git a/lib/am/texi-vers.am b/lib/am/texi-vers.am
index baf2ccd..5172cbe 100644 (file)
--- a/lib/am/texi-vers.am
+++ b/lib/am/texi-vers.am
@@ -15,12 +15,12 @@
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
-@VTEXI@: @MAINT@stamp-@VTI@
-       cp $(srcdir)/stamp-@VTI@ $(srcdir)/@VTEXI@
+$(srcdir)/@VTEXI@: @MAINT@stamp-@VTI@
+       @:
 
 ## Depend on configure.in so that version number updates cause a
 ## rebuild.
-stamp-@VTI@: @TEXI@ $(top_srcdir)/configure.in
+$(srcdir)/stamp-@VTI@: @TEXI@ $(top_srcdir)/configure.in
        @echo "@set UPDATED `cd $(srcdir) \
          && $(SHELL) @MDDIR@/mdate-sh @TEXI@`" > @VTI@.tmp
        @echo "@set EDITION $(VERSION)" >> @VTI@.tmp
@@ -28,10 +28,11 @@ stamp-@VTI@: @TEXI@ $(top_srcdir)/configure.in
 ## Use cp and rm here because some older "mv"s can't move across
 ## filesystems.  Furthermore, GNU "mv" in the AmigaDOS environment
 ## can't handle this.
-       @cmp -s @VTI@.tmp $(srcdir)/stamp-@VTI@ \
-         || (echo "Updating $(srcdir)/stamp-@VTI@"; \
-             cp @VTI@.tmp $(srcdir)/stamp-@VTI@)
+       @cmp -s @VTI@.tmp $(srcdir)/@VTEXI@ \
+         || (echo "Updating $(srcdir)/@VTEXI@"; \
+             cp @VTI@.tmp $(srcdir)/@VTEXI@)
        -@rm -f @VTI@.tmp
+       @cp $(srcdir)/@VTEXI@ $@
 
 mostlyclean-@VTI@:
        -rm -f @VTI@.tmp

diff --git a/texi-vers.am b/texi-vers.am
index baf2ccd..5172cbe 100644 (file)
--- a/texi-vers.am
+++ b/texi-vers.am
@@ -15,12 +15,12 @@
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
-@VTEXI@: @MAINT@stamp-@VTI@
-       cp $(srcdir)/stamp-@VTI@ $(srcdir)/@VTEXI@
+$(srcdir)/@VTEXI@: @MAINT@stamp-@VTI@
+       @:
 
 ## Depend on configure.in so that version number updates cause a
 ## rebuild.
-stamp-@VTI@: @TEXI@ $(top_srcdir)/configure.in
+$(srcdir)/stamp-@VTI@: @TEXI@ $(top_srcdir)/configure.in
        @echo "@set UPDATED `cd $(srcdir) \
          && $(SHELL) @MDDIR@/mdate-sh @TEXI@`" > @VTI@.tmp
        @echo "@set EDITION $(VERSION)" >> @VTI@.tmp
@@ -28,10 +28,11 @@ stamp-@VTI@: @TEXI@ $(top_srcdir)/configure.in
 ## Use cp and rm here because some older "mv"s can't move across
 ## filesystems.  Furthermore, GNU "mv" in the AmigaDOS environment
 ## can't handle this.
-       @cmp -s @VTI@.tmp $(srcdir)/stamp-@VTI@ \
-         || (echo "Updating $(srcdir)/stamp-@VTI@"; \
-             cp @VTI@.tmp $(srcdir)/stamp-@VTI@)
+       @cmp -s @VTI@.tmp $(srcdir)/@VTEXI@ \
+         || (echo "Updating $(srcdir)/@VTEXI@"; \
+             cp @VTI@.tmp $(srcdir)/@VTEXI@)
        -@rm -f @VTI@.tmp
+       @cp $(srcdir)/@VTEXI@ $@
 
 mostlyclean-@VTI@:
        -rm -f @VTI@.tmp