Module Name: src
Committed By: apb
Date: Tue Aug 6 21:47:01 UTC 2013
Modified Files:
src/tools: Makefile.gnuhost
src/tools/autoconf: Makefile
Log Message:
Add the "-g -D__gnu__" flags when invoking M4 via CONFIGURE_ARGS
in tools/Makefile.gnuhost. This makes the tools version of m4
behave like GNU m4.
Remove similar code from tools/autoconf/Makefile, where it didn't
work because Makefile.gnuhost would previously have overridden it.
This fixes a problem in which the tools version of autoconf complained
"M4sugar requires GNU M4.
Install it before installing M4sugar or set the M4 environment variable to its
path name."
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/tools/Makefile.gnuhost
cvs rdiff -u -r1.4 -r1.5 src/tools/autoconf/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/Makefile.gnuhost
diff -u src/tools/Makefile.gnuhost:1.39 src/tools/Makefile.gnuhost:1.40
--- src/tools/Makefile.gnuhost:1.39 Tue Jun 19 21:48:33 2012
+++ src/tools/Makefile.gnuhost Tue Aug 6 21:47:01 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.gnuhost,v 1.39 2012/06/19 21:48:33 hans Exp $
+# $NetBSD: Makefile.gnuhost,v 1.40 2013/08/06 21:47:01 apb Exp $
#
# Rules used when building a GNU host package. Expects MODULE to be set.
#
@@ -56,7 +56,7 @@ CONFIGURE_ENV+= \
INSTALL=${HOST_INSTALL_FILE:Q} \
LDFLAGS=${HOST_LDFLAGS:Q} \
LEX=${LEX:Q} \
- M4=${TOOL_M4:Q} \
+ M4=${TOOL_M4:Q}" -g -D__gnu__" \
MAKE=${MAKE_PROGRAM:Q} \
PATH="${TOOLDIR}/bin:$$PATH" \
RANLIB=${HOST_RANLIB:Q} \
Index: src/tools/autoconf/Makefile
diff -u src/tools/autoconf/Makefile:1.4 src/tools/autoconf/Makefile:1.5
--- src/tools/autoconf/Makefile:1.4 Sun Dec 8 20:19:57 2002
+++ src/tools/autoconf/Makefile Tue Aug 6 21:47:01 2013
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2002/12/08 20:19:57 thorpej Exp $
+# $NetBSD: Makefile,v 1.5 2013/08/06 21:47:01 apb Exp $
MODULE= autoconf
CONFIGURE_ARGS= --program-prefix=${_TOOL_PREFIX}
-CONFIGURE_ENV= M4="${TOOLDIR}/bin/${_TOOL_PREFIX}m4 -g -D__gnu__"
.include "${.CURDIR}/../Makefile.gnuhost"
