From Jim Meyering:

	* automake.in (handle_dist): Add `;\' to end of distcheck-hook
	line.
	(scan_one_configure_file): In LIBOBJS, recognize `$ac_objext' as
	legitimate ending.  Fixes libobj9.test.

diff --git a/ChangeLog b/ChangeLog
index 6be2b763013aae238c4e0813f55e96975cc06b3f..23cf724eaf30151fdec151ab2f0ed5031f64c20f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 1999-03-11  Tom Tromey  <tromey@cygnus.com>
 
+       From Jim Meyering:
+       * automake.in (handle_dist): Add `;\' to end of distcheck-hook
+       line.
+       (scan_one_configure_file): In LIBOBJS, recognize `$ac_objext' as
+       legitimate ending.  Fixes libobj9.test.
+
        From Ralf Corsepius.  Fixes lex3.test.
        * automake.in (lang_yacc_finish): Include `.' in name pushed onto
        maintainer-clean list.

diff --git a/automake.in b/automake.in
index 26fef5f2c8167a13839b218909d07314fd06baa1..4558c7c032511324c74d20d0a2ef4a6071f92086 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -2547,7 +2547,7 @@ distcheck: dist
        dc_install_base=`cd $(distdir)/=inst && pwd`; \\'
                          . (&target_defined ('distcheck-hook')
                             ? ("\t\$(MAKE) \$(AM_MAKEFLAGS)"
-                               . " distcheck-hook")
+                               . " distcheck-hook; \\")
                             : '')
                          . '
        cd $(distdir)/=build \\
@@ -4005,7 +4005,9 @@ sub scan_one_configure_file
        {
            foreach $libobj_iter (split (' ', $1))
            {
-               if ($libobj_iter =~ /^(.*)\.o(bj)?$/)
+               if ($libobj_iter =~ /^(.*)\.o(bj)?$/
+                   || $libobj_iter =~ /^(.*)\.\$ac_objext$/
+                   || $libobj_iter =~ /^(.*)\.\$\{ac_objext\}$/)
                {
                    $libsources{$1 . '.c'} = 1;
                }