[pkgsrc/trunk]: pkgsrc/devel/bmake/files Respect CFLAGS in a more conservativ...

[schmonz <schmonz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3d8a534c6262
branches:  trunk
changeset: 529272:3d8a534c6262
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Tue May 29 19:00:42 2007 +0000

description:
Respect CFLAGS in a more conservative way. This preserves the ability
to build Universal on Mac OS X, and may undo the Solaris breakage
caused by the previous commit (reported in PR pkg/36408 and on
pkgsrc-users@).

diffstat:

 devel/bmake/files/Makefile.in              |  7 +++----
 devel/bmake/files/lst.lib/makefile.boot.in |  5 ++---
 devel/bmake/files/makefile.boot.in         |  5 ++---
 3 files changed, 7 insertions(+), 10 deletions(-)

diffs (63 lines):

diff -r 9ee5bd181102 -r 3d8a534c6262 devel/bmake/files/Makefile.in
--- a/devel/bmake/files/Makefile.in     Tue May 29 18:35:58 2007 +0000
+++ b/devel/bmake/files/Makefile.in     Tue May 29 19:00:42 2007 +0000
@@ -1,7 +1,7 @@
-#      $NetBSD: Makefile.in,v 1.3 2007/05/23 04:21:05 schmonz Exp $
+#      $NetBSD: Makefile.in,v 1.4 2007/05/29 19:00:42 schmonz Exp $
 #      @(#)Makefile    5.2 (Berkeley) 12/28/90
 
-#      $Id: Makefile.in,v 1.3 2007/05/23 04:21:05 schmonz Exp $
+#      $Id: Makefile.in,v 1.4 2007/05/29 19:00:42 schmonz Exp $
 
 PROG=  bmake
 SRCS=  arch.c buf.c compat.c cond.c dir.c for.c hash.c job.c main.c \
@@ -29,8 +29,7 @@
 MACHINE=@machine@
 MACHINE_ARCH=@machine_arch@
 
-CFLAGS?= @CFLAGS@
-CFLAGS+= -D_PATH_DEFSYSPATH=\"@default_sys_path@\"
+CFLAGS+= @CFLAGS@ -D_PATH_DEFSYSPATH=\"@default_sys_path@\"
 CFLAGS+= -I. -I${srcdir} @DEFS@ @CPPFLAGS@ ${XDEFS} -DMAKE_NATIVE
 CFLAGS+= ${CFLAGS_${.TARGET:T}} 
 CFLAGS_main.o= "-DMAKE_VERSION=\"${MAKE_VERSION}\""
diff -r 9ee5bd181102 -r 3d8a534c6262 devel/bmake/files/lst.lib/makefile.boot.in
--- a/devel/bmake/files/lst.lib/makefile.boot.in        Tue May 29 18:35:58 2007 +0000
+++ b/devel/bmake/files/lst.lib/makefile.boot.in        Tue May 29 19:00:42 2007 +0000
@@ -1,5 +1,5 @@
 # RCSid:
-#      $Id: makefile.boot.in,v 1.2 2007/05/23 04:21:05 schmonz Exp $
+#      $Id: makefile.boot.in,v 1.3 2007/05/29 19:00:42 schmonz Exp $
 
 srcdir=@srcdir@
 VPATH=.:$(srcdir)
@@ -10,8 +10,7 @@
     lstDatum.o lstForEach.o lstMember.o lstSucc.o lstDeQueue.o \
     lstForEachFrom.o lstDestroy.o lstNext.o 
 
-CFLAGS=@CFLAGS@
-CFLAGS+=-I..
+CFLAGS=@CFLAGS@ -I..
 all: ${OBJ}
 
 depend:
diff -r 9ee5bd181102 -r 3d8a534c6262 devel/bmake/files/makefile.boot.in
--- a/devel/bmake/files/makefile.boot.in        Tue May 29 18:35:58 2007 +0000
+++ b/devel/bmake/files/makefile.boot.in        Tue May 29 19:00:42 2007 +0000
@@ -1,5 +1,5 @@
 # RCSid:
-#      $Id: makefile.boot.in,v 1.4 2007/05/23 04:21:05 schmonz Exp $
+#      $Id: makefile.boot.in,v 1.5 2007/05/29 19:00:42 schmonz Exp $
 
 #
 # modify MACHINE and MACHINE_ARCH as appropriate for your target architecture
@@ -14,8 +14,7 @@
 MK=${prefix}/share/mk
 MKSRC=@mksrc@
 DEFAULT_MAKESYSPATH=@default_sys_path@
-CFLAGS=@CFLAGS@
-CFLAGS+=-I. -I$(srcdir) @DEFS@ @CPPFLAGS@ ${XDEFS} -D_PATH_DEFSYSPATH=\"@default_sys_path@\"
+CFLAGS=@CFLAGS@ -I. -I$(srcdir) @DEFS@ @CPPFLAGS@ ${XDEFS} -D_PATH_DEFSYSPATH=\"@default_sys_path@\"
 MDEFS="-D@force_machine@MACHINE=\"@machine@\"" "-DMACHINE_ARCH=\"@machine_arch@\""
 
 OBJ=arch.o buf.o compat.o cond.o dir.o for.o hash.o job.o main.o make.o \