summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.pre.in6
-rw-r--r--Misc/NEWS3
2 files changed, 6 insertions, 3 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in
index 251b8203f6..794e641f74 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -54,8 +54,8 @@ MAKESETUP= $(srcdir)/Modules/makesetup
# 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 @@ $(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT)
-$(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 a04cf6ebee..0be3da7e61 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -741,6 +741,9 @@ Tools/Demos
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