re PR bootstrap/20437 (bootstrap --enable-maintainer-mode broken)

fixincludes:
2006-07-10  Laurynas Biveinis  <laurynas.biveinis@gmail.com>

	PR bootstrap/20437
	* Makefile.in (configure, config.h.in): change into $(srcdir)
	before autoconf or autoheader call.

gcc:
2006-07-10  Laurynas Biveinis  <laurynas.biveinis@gmail.com>

	PR bootstrap/20437
	* Makefile.in (configure): add missing aclocal.m4 and acinclude.m4
	dependencies.

From-SVN: r115310

diff --git a/fixincludes/ChangeLog b/fixincludes/ChangeLog
index cfd7f4aceff82a26f3384e78e0288d60fdf39f03..962ab90ab6632555324961991bfc2f45d4f6243d 100644 (file)
--- a/fixincludes/ChangeLog
+++ b/fixincludes/ChangeLog
@@ -1,3 +1,9 @@
+2006-07-10  Laurynas Biveinis  <laurynas.biveinis@gmail.com>
+
+       PR bootstrap/20437
+       * Makefile.in (configure, config.h.in): change into $(srcdir)
+       before autoconf or autoheader call.
+
 2006-06-23  Steve Ellcey  <sje@cup.hp.com>
 
        PR target/28084

diff --git a/fixincludes/Makefile.in b/fixincludes/Makefile.in
index 763dc0563a1c501658a4ebfdd4f5f5a0d54264dd..d5c265763048f8579dc50708f5057d7f34f88d6f 100644 (file)
--- a/fixincludes/Makefile.in
+++ b/fixincludes/Makefile.in
@@ -160,10 +160,10 @@ config.status: $(srcdir)/configure
        $(SHELL) ./config.status --recheck
 
 $(srcdir)/configure: @MAINT@ $(srcdir)/configure.ac
-       autoconf
+       cd $(srcdir) && autoconf
 
 $(srcdir)/config.h.in: @MAINT@ $(srcdir)/configure.ac
-       autoheader
+       cd $(srcdir) && autoheader
 
 $(srcdir)/aclocal.m4: @MAINT@ $(srcdir)/../gcc/aclocal.m4
        cp $(srcdir)/../gcc/aclocal.m4 .

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 743178a5a3bb9bb6073968128bff9c32fa8ff1ba..b8373d18c9c6f41c82b48dead7a9d990c28c1c8d 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2006-07-10  Laurynas Biveinis  <laurynas.biveinis@gmail.com>
+
+       PR bootstrap/20437
+       * Makefile.in (configure): add missing aclocal.m4 and acinclude.m4
+       dependencies.
+
 2006-07-08  Matthias Klose  <doko@debian.org>
 
        * doc/sourcebuild.texi: Fix typo.

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 3287de9a60549ca4ad9c3b1dce0fe753ad420015..2514591083861956fcfb6e3c9d2ee7aa5ad6e96e 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -1218,7 +1218,8 @@ cs-tm_p.h: Makefile
 # might be on a read-only file system.  If configured for maintainer mode
 # then do allow autoconf to be run.
 
-$(srcdir)/configure: @MAINT@ $(srcdir)/configure.ac
+$(srcdir)/configure: @MAINT@ $(srcdir)/configure.ac $(srcdir)/aclocal.m4 \
+  $(srcdir)/acinclude.m4
        (cd $(srcdir) && autoconf)
 
 gccbug:        $(srcdir)/gccbug.in