From 28faebf2683a1d4f25a7a591e6dd60d7cc7bb80c Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@redhat.com>
Date: Mon, 5 Feb 1996 20:23:49 +0000
Subject: [PATCH] Bug fixes

---
 ChangeLog   | 18 ++++++++++++++++++
 automake.in | 22 +++++++++++++++-------
 2 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bbb59fba..e2f0beb7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+Wed Jan 31 09:51:30 1996  Tom Tromey  (tromey@gerbil.cygnus.com)
+
+	* depend.am: Don't use srcdir anywhere.
+	* automake.in (handle_libraries): Don't make .deps relative to
+	srcdir.
+	(handle_options): Reocgnize no-dependencies.
+
+	* depend.am (MKDEP): From Jim Meyering: Do nothing if srcdir is
+	".".  Properly quote regexp.
+
+Tue Jan 30 12:19:09 1996  Tom Tromey  (tromey@gerbil.cygnus.com)
+
+	* automake.in (handle_configure): Only defined CONFIG_HEADER if
+	$config_name.
+	(read_am_file): Quote regexp when substituting top_builddir.
+	(handle_source_transform, handle_libraries): Look in
+	$(srcdir)/.deps for .P files.
+
 Fri Jan 26 00:15:25 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
 	* automake.in (read_am_file): Compute top_builddir when including
diff --git a/automake.in b/automake.in
index 08bef9ce..31637d7e 100755
--- a/automake.in
+++ b/automake.in
@@ -312,6 +312,11 @@ sub handle_options
 	{
 	    # Explicitly recognize these.
 	}
+	elsif ($_ eq 'no-dependencies')
+	{
+	    # FIXME for now this is global.
+	    $use_dependencies = 0;
+	}
 	else
 	{
 	    &am_error ('option ', $_, 'not recognized');
@@ -391,7 +396,7 @@ sub handle_source_transform
 		# Transform .o or $o file into .P file (for automatic
 		# dependency code).
 		s/$objpat$/.P/g;
-		$dep_files{$_} = 1;
+		$dep_files{'.deps/' . $_} = 1;
 	    }
 
 	    &pretty_print ($one_file . "_OBJECTS =", '', @result);
@@ -499,7 +504,7 @@ sub handle_libraries
 			if ($iter ne 'alloca.c')
 			{
 			    ($rewrite = $iter) =~ s/\.c$/.P/;
-			    $dep_files{$rewrite} = 1;
+			    $dep_files{'.deps/' . $rewrite} = 1;
 			    &require_file ($NORMAL, $iter);
 			}
 		    }
@@ -508,7 +513,7 @@ sub handle_libraries
 		{
 		    &am_error ("\@ALLOCA\@ seen but \`AC_FUNC_ALLOCA' not in \`configure.in'")
 			if ! defined $libsources{'alloca.c'};
-		    $dep_files{'alloca.P'} = 1;
+		    $dep_files{'.deps/alloca.P'} = 1;
 		    &require_file ($NORMAL, 'alloca.c');
 		}
 	    }
@@ -949,7 +954,7 @@ sub handle_dist
     else
     {
 	$output_rules .= ("\nsubdir = " . $relative_dir . "\n"
-			  . 'distdir = $(topdir)/$(PACKAGE)-$(VERSION)/$(subdir)'
+			  . 'distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)'
 			  . "\n");
     }
 
@@ -1098,7 +1103,8 @@ sub handle_configure
     # Generate CONFIG_HEADER define, and define interally.
     $output_vars .= "CONFIG_HEADER = ${top_builddir}${config_name}\n"
 	if $config_name;
-    $contents{'CONFIG_HEADER'} = "${top_builddir}${config_name}";
+    $contents{'CONFIG_HEADER'} = "${top_builddir}${config_name}"
+	if $config_name;
 }
 
 # Handle C headers.
@@ -1609,9 +1615,11 @@ sub read_am_file
     @topdir = ('.') if ! @topdir;
 
     $top_builddir = join ('/', @topdir);
+    local ($build_rx);
+    ($build_rx = $top_builddir) =~ s/(\W)/\\$1/g;
     local ($header_vars) =
 	&file_contents_with_transform
-	    ('s/\@top_builddir\@/' . $top_builddir . '/g',
+	    ('s/\@top_builddir\@/' . $build_rx . '/g',
 	     'header-vars');
 
     open (AM_FILE, $amfile) || die "automake: couldn't open $amfile: $!\n";
@@ -1727,7 +1735,7 @@ sub read_am_file
 	    # de-ANSI-fication.  This is deprecated.  Remove in the
 	    # future.
 	    $contents{'@kr@'} = 1;
-	    &am_error ('@kr@ is deprecated; put "ansi2knr" in AUTOMAKE_OPTIONS instead');
+	    &am_error ('`@kr@\' is deprecated; put `ansi2knr\' in AUTOMAKE_OPTIONS instead');
 	}
 	else
 	{
-- 
2.43.5