From: Alexandre Duret-Lutz <adl@gnu.org>
Date: Wed, 4 Dec 2002 20:22:20 +0000 (+0000)
Subject: * automake.in (handle_languages): Test $objdir, not $srcdir, to
X-Git-Tag: Release-1-7b~333
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=33ecd72fa1bb1049df50dc8d582355cbd7623e7f;p=automake.git

* automake.in (handle_languages): Test $objdir, not $srcdir, to
decides whether a _.c file is in a subdirectory and has to be
cleaned separately.
Reported by Kevin Ride.
---

diff --git a/ChangeLog b/ChangeLog
index ef3bf03f..7d2687a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2002-12-04  Alexandre Duret-Lutz  <adl@gnu.org>
 
+	* automake.in (handle_languages): Test $objdir, not $srcdir, to
+	decides whether a _.c file is in a subdirectory and has to be
+	cleaned separately.
+	Reported by Kevin Ride.
+
 	* tests/ansi10.test (liblib_a_LIBADD): Set ac_cv_prog_cc_stdc
 	not am_cv_prog_cc_stdc.
 
diff --git a/automake.in b/automake.in
index 106f6148..dbfe3485 100755
--- a/automake.in
+++ b/automake.in
@@ -2172,11 +2172,11 @@ sub handle_languages
 	    # we have to create foo_.c in the current directory.
 	    # (Unless the user asks 'subdir-objects'.)  This is important
 	    # in case the same file (`foo.c') is compiled from other
-	    # directories with different cpp options: foo_.c file would
-	    # be preprocessed for only once set of options if it were
-	    # but in the subdirectory.
+	    # directories with different cpp options: foo_.c would
+	    # be preprocessed for only one set of options if it were
+	    # put in the subdirectory.
 	    #
-	    # Because foo$U.o must be build from either foo_.c or
+	    # Because foo$U.o must be built from either foo_.c or
 	    # sub/foo.c we can't be as concise as in the first example.
 	    # Instead we output
 	    #
@@ -2206,9 +2206,9 @@ sub handle_languages
 		(my $source_ = $source) =~ s/\$U/_/g;
 		# Explicitely clean the _.c files if they are in
 		# a subdirectory. (In the current directory they get
-		# erase by a `rm -f *_.c' rule.)
+		# erased by a `rm -f *_.c' rule.)
 		$clean_files{$source_} = MOSTLY_CLEAN
-		  if $srcdir ne '.';
+		  if $objdir ne '.';
 		# Output an additional rule if _.c and .c are not in
 		# the same directory.  (_.c is always in $objdir.)
 		if ($objdir ne $srcdir)