SF patch 659809, by Daniel Brotsky: fix Makefile.pre to use config
env.
This adds @CFLAGS@ and @CPPFLAGS@ to the end of the respective
variable definitions. It also adds $(LDFLAGS) to the $(CC) invocation
to build $(PGEN).
diff --git a/Makefile.pre.in b/Makefile.pre.in
index 251b820..794e641 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -54,8 +54,8 @@
# Compiler options
OPT= @OPT@
-CFLAGS= $(OPT)
-CPPFLAGS= -I. -I$(srcdir)/Include
+CFLAGS= $(OPT) @CFLAGS@
+CPPFLAGS= -I. -I$(srcdir)/Include @CPPFLAGS@
LDFLAGS= @LDFLAGS@
LDLAST= @LDLAST@
SGI_ABI= @SGI_ABI@
@@ -427,7 +427,7 @@
-$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
$(PGEN): $(PGENOBJS)
- $(CC) $(OPT) $(PGENOBJS) $(LIBS) -o $(PGEN)
+ $(CC) $(OPT) $(PGENOBJS) $(LDFLAGS) $(LIBS) -o $(PGEN)
Parser/grammar.o: $(srcdir)/Parser/grammar.c \
$(srcdir)/Include/token.h \
diff --git a/Misc/NEWS b/Misc/NEWS
index a04cf6e..0be3da7 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -741,6 +741,9 @@
Build
-----
+- Makefile.pre.in now adds @CFLAGS@ and @CPPFLAGS@ to their respective
+ variable definitions.
+
- On Unix, IDLE is now installed automatically.
- The fpectl module is not built by default; it's dangerous or useless