From 1c53cd00ba5e0053787d3063cb01aabadc778fa2 Mon Sep 17 00:00:00 2001 From: Nathanael Nerode Date: Fri, 14 Mar 2003 20:49:14 +0000 Subject: [PATCH] * Makefile.tpl: Move .NOEXPORT, MAKEOVERRIDES back down. * Makefile.in: Regenerate. --- ChangeLog | 5 +++++ Makefile.in | 12 ++++++++---- Makefile.tpl | 12 ++++++++---- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index fc3fb527a..326297949 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-03-14 Nathanael Nerode + + * Makefile.tpl: Move .NOEXPORT, MAKEOVERRIDES back down. + * Makefile.in: Regenerate. + 2003-03-14 Michael Chastain * Makefile.in: Regenerate with correct Makefile.def. diff --git a/Makefile.in b/Makefile.in index c40fd8155..f70250dd8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -20,10 +20,6 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # -# Don't pass command-line variables to submakes. -.NOEXPORT: -MAKEOVERRIDES= - # ------------------------------- # Standard Autoconf-set variables # ------------------------------- @@ -7529,10 +7525,18 @@ AUTOCONF = autoconf $(srcdir)/configure: @MAINT@ $(srcdir)/configure.in $(srcdir)/config/acx.m4 cd $(srcdir) && $(AUTOCONF) +# ------------------------------ +# Special directives to GNU Make +# ------------------------------ + # Tell GNU make 3.79 not to run the top level in parallel. This # prevents contention for $builddir/$target/config.cache, as well # as minimizing scatter in file system caches. NOTPARALLEL = .NOTPARALLEL $(NOTPARALLEL): +# Don't pass command-line variables to submakes. +.NOEXPORT: +MAKEOVERRIDES= + # end of Makefile.in diff --git a/Makefile.tpl b/Makefile.tpl index ab37bdf2b..72e24983c 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -23,10 +23,6 @@ in # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # -# Don't pass command-line variables to submakes. -.NOEXPORT: -MAKEOVERRIDES= - # ------------------------------- # Standard Autoconf-set variables # ------------------------------- @@ -1454,10 +1450,18 @@ AUTOCONF = autoconf $(srcdir)/configure: @MAINT@ $(srcdir)/configure.in $(srcdir)/config/acx.m4 cd $(srcdir) && $(AUTOCONF) +# ------------------------------ +# Special directives to GNU Make +# ------------------------------ + # Tell GNU make 3.79 not to run the top level in parallel. This # prevents contention for $builddir/$target/config.cache, as well # as minimizing scatter in file system caches. NOTPARALLEL = .NOTPARALLEL $(NOTPARALLEL): +# Don't pass command-line variables to submakes. +.NOEXPORT: +MAKEOVERRIDES= + # end of Makefile.in