Revert SF patch 659809 -- it causes double options that can cause breakage.

diff --git a/Makefile.pre.in b/Makefile.pre.in
index bf10d1c4697f73ac1c336a5480353c36d8ed1330..2dde4af3c6b4ad6f49239a5fa1a50b14e801aa46 100644 (file)
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -54,8 +54,8 @@ MAKESETUP=      $(srcdir)/Modules/makesetup
 
 # Compiler options
 OPT=           @OPT@
-CFLAGS=                $(OPT) @CFLAGS@
-CPPFLAGS=      -I. -I$(srcdir)/Include @CPPFLAGS@
+CFLAGS=                $(OPT)
+CPPFLAGS=      -I. -I$(srcdir)/Include
 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) $(LDFLAGS) $(LIBS) -o $(PGEN)
+               $(CC) $(OPT) $(PGENOBJS) $(LIBS) -o $(PGEN)
 
 Parser/grammar.o:      $(srcdir)/Parser/grammar.c \
                                $(srcdir)/Include/token.h \

diff --git a/Misc/NEWS b/Misc/NEWS
index b5345bf254e56f196ef6ade765a59d5a5fdbef3a..edb4fc8046e87437cfb3528911906406b382f401 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -764,9 +764,6 @@ 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