[src/trunk]: src/tools Revert previous change to tools/Makefile.gnuhost. Whe...

[apb <apb%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6764b03d955e
branches:  trunk
changeset: 789123:6764b03d955e
user:      apb <apb%NetBSD.org@localhost>
date:      Wed Aug 07 17:50:55 2013 +0000

description:
Revert previous change to tools/Makefile.gnuhost.  When getenv("M4")
contains multiple words, flex fails.

Adjust tools/autoconf/Makefile to pass the necessary extra arguments via
M4=... in CONFIGURE_ENV.  This is similar to what used to be in
revision 1.4 of tools/autoconf/Makefile, but it's now after instead of
before the inclusion of Makefile.gnuhost, because it has to override the
value of M4=...  that Makefile.gnuhost stores in CONFIGURE_ENV.

diffstat:

 tools/Makefile.gnuhost  |  4 ++--
 tools/autoconf/Makefile |  9 ++++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diffs (37 lines):

diff -r ba7190feae4a -r 6764b03d955e tools/Makefile.gnuhost
--- a/tools/Makefile.gnuhost    Wed Aug 07 17:36:11 2013 +0000
+++ b/tools/Makefile.gnuhost    Wed Aug 07 17:50:55 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.gnuhost,v 1.40 2013/08/06 21:47:01 apb Exp $
+#      $NetBSD: Makefile.gnuhost,v 1.41 2013/08/07 17:50:55 apb Exp $
 #
 # Rules used when building a GNU host package.  Expects MODULE to be set.
 #
@@ -56,7 +56,7 @@
                INSTALL=${HOST_INSTALL_FILE:Q} \
                LDFLAGS=${HOST_LDFLAGS:Q} \
                LEX=${LEX:Q} \
-               M4=${TOOL_M4:Q}" -g -D__gnu__" \
+               M4=${TOOL_M4:Q} \
                MAKE=${MAKE_PROGRAM:Q} \
                PATH="${TOOLDIR}/bin:$$PATH" \
                RANLIB=${HOST_RANLIB:Q} \
diff -r ba7190feae4a -r 6764b03d955e tools/autoconf/Makefile
--- a/tools/autoconf/Makefile   Wed Aug 07 17:36:11 2013 +0000
+++ b/tools/autoconf/Makefile   Wed Aug 07 17:50:55 2013 +0000
@@ -1,7 +1,14 @@
-#      $NetBSD: Makefile,v 1.5 2013/08/06 21:47:01 apb Exp $
+#      $NetBSD: Makefile,v 1.6 2013/08/07 17:50:55 apb Exp $
 
 MODULE=                autoconf
 
 CONFIGURE_ARGS=        --program-prefix=${_TOOL_PREFIX}
 
 .include "${.CURDIR}/../Makefile.gnuhost"
+
+# This value of M4=... makes our ${TOOL_M4} emulate GNU M4.
+# Makefile.gnuhost stores a different value of M4=... in CONFIGURE_ENV,
+# so we have to append to CONFIGURE_ENV *after* including
+# Makefile.gnuhost.
+#
+CONFIGURE_ENV+=        M4=${TOOL_M4:Q}" -g -D__gnu__"