From: Tom Tromey <tromey@redhat.com>
Date: Thu, 11 Mar 1999 22:52:32 +0000 (+0000)
Subject: 	From Jim Meyering:
X-Git-Tag: user-dep-gen-branchpoint~24
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=647f1187099bd7a695fedb8b4327acab4c8e72a1;p=automake.git

	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 6be2b763..23cf724e 100644
--- 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 26fef5f2..4558c7c0 100755
--- 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;
 		}