[Python-checkins] python/dist/src Makefile.pre.in,1.104,1.105

[gvanrossum@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src
In directory sc8-pr-cvs1:/tmp/cvs-serv5332

Modified Files:
	Makefile.pre.in 
Log Message:
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).


Index: Makefile.pre.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/Makefile.pre.in,v
retrieving revision 1.104
retrieving revision 1.105
diff -C2 -d -r1.104 -r1.105
*** Makefile.pre.in	21 Nov 2002 20:29:57 -0000	1.104
--- Makefile.pre.in	30 Dec 2002 21:02:01 -0000	1.105
***************
*** 55,60 ****
  # Compiler options
  OPT=		@OPT@
! CFLAGS=		$(OPT)
! CPPFLAGS=	-I. -I$(srcdir)/Include
  LDFLAGS=	@LDFLAGS@
  LDLAST=		@LDLAST@
--- 55,60 ----
  # Compiler options
  OPT=		@OPT@
! CFLAGS=		$(OPT) @CFLAGS@
! CPPFLAGS=	-I. -I$(srcdir)/Include @CPPFLAGS@
  LDFLAGS=	@LDFLAGS@
  LDLAST=		@LDLAST@
***************
*** 428,432 ****
  
  $(PGEN):	$(PGENOBJS)
! 		$(CC) $(OPT) $(PGENOBJS) $(LIBS) -o $(PGEN)
  
  Parser/grammar.o:	$(srcdir)/Parser/grammar.c \
--- 428,432 ----
  
  $(PGEN):	$(PGENOBJS)
! 		$(CC) $(OPT) $(PGENOBJS) $(LDFLAGS) $(LIBS) -o $(PGEN)
  
  Parser/grammar.o:	$(srcdir)/Parser/grammar.c \