From: Tom Tromey <tromey@redhat.com>
Date: Thu, 18 Jan 1996 07:49:59 +0000 (+0000)
Subject: Changes from Franc,ois
X-Git-Tag: Release-0-29~18
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e0427d533155179810fa6684115ae904e07fa20f;p=thirdparty%2Fautomake.git

Changes from Franc,ois
---

diff --git a/ChangeLog b/ChangeLog
index c7db9d0e9..96b8f2d43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 Thu Jan 18 00:25:56 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
+	From François Pinard:
+	* automake.in (handle_source_transform): Transform $o file into .P
+	file.
+	(handle_dist_worker): Handle case where DISTFILES includes
+	wildcard.  Bug fix in subdir case.
+
 	* automake.in (parse_arguments): Initialize strictness to
 	'normal'.
 
diff --git a/automake.in b/automake.in
index 98315320b..bee2e7084 100755
--- a/automake.in
+++ b/automake.in
@@ -344,6 +344,8 @@ sub get_object_extension
 sub handle_source_transform
 {
     local ($one_file, $obj) = @_;
+    local ($objpat) = $obj;
+    $objpat =~ s/([.\$])/\\\1/g;
 
     # Look for file_SOURCES and file_OBJECTS.
     if (defined $contents{$one_file . "_SOURCES"})
@@ -371,9 +373,9 @@ sub handle_source_transform
 		s/\.[cCmylfs]$/$obj/g;
 		push (@result, $_);
 
-		# Transform .o file into .P file (for automatic
+		# Transform .o or $o file into .P file (for automatic
 		# dependency code).
-		s/$obj/.P/g;
+		s/$objpat$/.P/g;
 		$dep_files{$_} = 1;
 	    }
 
@@ -725,8 +727,10 @@ sub handle_dist_worker
     # Also, there are situations in which "ln" can fail.  For instance
     # a file to distribute could actually be a cross-filesystem
     # symlink -- this can easily happen if "gettextize" was run on the
-    # distribution.
-    $output_rules .= '	@for file in $(DISTFILES); do		\\
+    # distribution.  Note that DISTFILES can contain a wildcard (for
+    # info files, sigh), so we must use the echo trick.
+
+    $output_rules .= '	@for file in `cd $(srcdir) && $(DISTFILES); do \\
 	  test -f $(distdir)/$$file \\
 	  || ln $(srcdir)/$$file $(distdir)/$$file 2> /dev/null \\
 	  || cp -p $(srcdir)/$$file $(distdir)/$$file; \\
@@ -818,7 +822,7 @@ sub handle_dist
     else
     {
 	$output_rules .= ("\nsubdir = " . $relative_dir . "\n"
-			  . 'distdir = $(PACKAGE)-$(VERSION)/$(subdir)'
+			  . 'distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)'
 			  . "\n");
     }