From cb4432edd513b1d7751f1559835bc0dd9f363ce3 Mon Sep 17 00:00:00 2001
From: tron <tron@pkgsrc.org>
Date: Fri, 5 Oct 2001 21:32:59 +0000
Subject: Prepend "${BUILDLINK_CPPFLAGS}" and "${BUILDLINK_LDFLAGS}" to
 "${CFLAGS}", "${CPPFLAGS}", "${CXXFLAGS}" respectively "${LDFLAGS}" in
 "bsd.pkg.mk" and not in "bsd.buildlink.mk" because "${BUILDLINK_CPPFLAGS}"
 and "${BUILDLINK_LDFLAGS}" might get changed several times by the
 "buildlink.mk" files of various packages.

---
 mk/bsd.buildlink.mk |  7 +------
 mk/bsd.pkg.mk       | 12 +++++++++++-
 2 files changed, 12 insertions(+), 7 deletions(-)

(limited to 'mk')

diff --git a/mk/bsd.buildlink.mk b/mk/bsd.buildlink.mk
index 60cf8a07324..6dc35893ca8 100644
--- a/mk/bsd.buildlink.mk
+++ b/mk/bsd.buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink.mk,v 1.39 2001/10/05 02:31:18 jlam Exp $
+# $NetBSD: bsd.buildlink.mk,v 1.40 2001/10/05 21:32:59 tron Exp $
 #
 # This Makefile fragment is included by package buildlink.mk files.  This
 # file does the following things:
@@ -122,11 +122,6 @@ BUILDLINK_DIR?=		${WRKDIR}/.buildlink
 BUILDLINK_CPPFLAGS=	-I${BUILDLINK_DIR}/include
 BUILDLINK_LDFLAGS=	-L${BUILDLINK_DIR}/lib
 
-CFLAGS:=		${BUILDLINK_CPPFLAGS} ${CFLAGS}
-CXXFLAGS:=		${BUILDLINK_CPPFLAGS} ${CXXFLAGS}
-CPPFLAGS:=		${BUILDLINK_CPPFLAGS} ${CPPFLAGS}
-LDFLAGS:=		${BUILDLINK_LDFLAGS} ${LDFLAGS}
-
 CONFIGURE_ENV+=		BUILDLINK_DIR="${BUILDLINK_DIR}"
 CONFIGURE_ENV+=		BUILDLINK_CPPFLAGS="${BUILDLINK_CPPFLAGS}"
 CONFIGURE_ENV+=		BUILDLINK_LDFLAGS="${BUILDLINK_LDFLAGS}"
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 9bc04a87d2f..ed4574123f3 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.822 2001/10/04 22:01:54 agc Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.823 2001/10/05 21:33:00 tron Exp $
 #
 # This file is in the public domain.
 #
@@ -319,6 +319,16 @@ DISTINFO_FILE?=		${.CURDIR}/distinfo
 M4?=			/usr/bin/m4
 .endif
 
+.if defined(BUILDLINK_CPPFLAGS)
+CFLAGS:=		${BUILDLINK_CPPFLAGS} ${CFLAGS}
+CXXFLAGS:=		${BUILDLINK_CPPFLAGS} ${CXXFLAGS}
+CPPFLAGS:=		${BUILDLINK_CPPFLAGS} ${CPPFLAGS}
+.endif
+
+.if defined(BUILDLINK_LDFLAGS)
+LDFLAGS:=		${BUILDLINK_LDFLAGS} ${LDFLAGS}
+.endif
+
 .if !defined(X11_BUILDLINK_MK)
 .  if defined(USE_X11BASE) || defined(USE_X11)
 LDFLAGS+=		-Wl,-R${X11BASE}/lib
-- 
cgit v1.2.3