remake bugs reported by Phil Nelson

diff --git a/ChangeLog b/ChangeLog
index 50c311c9351f7d78ac83056ab48e19aa54b8dea9..5418d7dbf5e0b2c48d981f8f863e6431e5d8e830 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 Sun Apr 27 11:03:36 1997  Tom Tromey  <tromey@cygnus.com>
 
+       * remake.am (config.status): Look in srcdir for config header.
+       ($(srcdir)/configure): Likewise.
+       * remake-hdr.am (@STAMP@): Look in srcdir for config header.  From
+       Phil Nelson.
+       ($(srcdir)/@CONFIG_HEADER_IN@): Likewise.
+
+       * automake.in (handle_aclocal_m4): Make target $(ACLOCAL_M4), not
+       value spelled out.  From Phil Nelson
+
        * automake.in (handle_configure): Don't skip Makefiles; instead
        skip automake inputs.
        (handle_merge_targets): Changed interface; put $makefile at

diff --git a/THANKS b/THANKS
index 9e8c07416429f35823ae3985b92c17e996e9e79a..9f6086b9394f324b72a58f55ccfaec318328cc6c 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -36,6 +36,7 @@ Michael Brantley <Michael-Brantley@deshaw.com>
 Noah Friedman <friedman@gnu.ai.mit.edu>
 Nyul Laszlo <nyul@sol.cc.u-szeged.hu>
 Per Bothner <bothner@cygnus.com>
+Phil Nelson <phil@cs.wwu.edu>
 Ralph Schleicher <rs@purple.UL.BaWue.DE>
 Ramón García Fernández <ramon@jl1.quim.ucm.es>
 Steve M. Robbins <steve@nyongwa.montreal.qc.ca>

diff --git a/automake.in b/automake.in
index c4bcc4321c87f49f7cc564e1f42fc4362e87ce42..47c56f1472ee35b80c10f9a359c08f46c229c0ce 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -2724,7 +2724,7 @@ sub handle_aclocal_m4
            }
        }
 
-       &pretty_print_rule ("\$(srcdir)/aclocal.m4:", "\t\t", @ac_deps);
+       &pretty_print_rule ("\$(ACLOCAL_M4):", "\t\t", @ac_deps);
 
        $output_rules .=  ("\t"
                           . 'cd $(srcdir) && $(ACLOCAL)'

diff --git a/lib/am/remake-hdr.am b/lib/am/remake-hdr.am
index 5088e82ecbb8e5c1a07c475aa69e7d9d020dcafd..5e17541d9ca596147077d988138d0c3aa059c17f 100644 (file)
--- a/lib/am/remake-hdr.am
+++ b/lib/am/remake-hdr.am
@@ -1,5 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
+## Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -16,12 +16,14 @@
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
 @CONFIG_HEADER@: @STAMP@
-@STAMP@: @CONFIG_HEADER_IN@ $(top_builddir)/config.status
+## Explicitly look in srcdir for benefit of non-GNU makes.
+@STAMP@: $(srcdir)/@CONFIG_HEADER_IN@ $(top_builddir)/config.status
        cd $(top_builddir) \
          && CONFIG_FILES= CONFIG_HEADERS=@CONFIG_HEADER_FULL@ \
             $(SHELL) ./config.status
        @echo timestamp > @STAMP@
-$(srcdir)/@CONFIG_HEADER_IN@: @MAINT@@STAMP@.in
+## Explicitly look in srcdir for benefit of non-GNU makes.
+$(srcdir)/@CONFIG_HEADER_IN@: @MAINT@$(srcdir)/@STAMP@.in
 $(srcdir)/@STAMP@.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) @FILES@
        cd $(top_srcdir) && $(AUTOHEADER)
        echo timestamp > $(srcdir)/@STAMP@.in

diff --git a/remake-hdr.am b/remake-hdr.am
index 5088e82ecbb8e5c1a07c475aa69e7d9d020dcafd..5e17541d9ca596147077d988138d0c3aa059c17f 100644 (file)
--- a/remake-hdr.am
+++ b/remake-hdr.am
@@ -1,5 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
+## Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -16,12 +16,14 @@
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
 @CONFIG_HEADER@: @STAMP@
-@STAMP@: @CONFIG_HEADER_IN@ $(top_builddir)/config.status
+## Explicitly look in srcdir for benefit of non-GNU makes.
+@STAMP@: $(srcdir)/@CONFIG_HEADER_IN@ $(top_builddir)/config.status
        cd $(top_builddir) \
          && CONFIG_FILES= CONFIG_HEADERS=@CONFIG_HEADER_FULL@ \
             $(SHELL) ./config.status
        @echo timestamp > @STAMP@
-$(srcdir)/@CONFIG_HEADER_IN@: @MAINT@@STAMP@.in
+## Explicitly look in srcdir for benefit of non-GNU makes.
+$(srcdir)/@CONFIG_HEADER_IN@: @MAINT@$(srcdir)/@STAMP@.in
 $(srcdir)/@STAMP@.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) @FILES@
        cd $(top_srcdir) && $(AUTOHEADER)
        echo timestamp > $(srcdir)/@STAMP@.in

diff --git a/remake.am b/remake.am
index 81b2d33202ea3ea7a9fbfc3c87e15581d77fd9a8..4c640f51d54772e3fd91d4007e1f091b7852dfa4 100644 (file)
--- a/remake.am
+++ b/remake.am
@@ -1,5 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
+## Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -15,7 +15,10 @@
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
-config.status: configure
+
+## Explicitly look in srcdir for benefit of non-GNU makes.
+config.status: $(srcdir)/configure
        $(SHELL) ./config.status --recheck
-$(srcdir)/configure: @MAINT@configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
+## Explicitly look in srcdir for benefit of non-GNU makes.
+$(srcdir)/configure: @MAINT@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
        cd $(srcdir) && $(AUTOCONF)