From 1c173ba8e2deca49b126f8bd939dadf46f3be360 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Mon, 11 Jun 2001 02:05:07 +0000
Subject: The buildlink include and lib directories are added to CFLAGS,
 CPPFLAGS, CXXFLAGS, and LDFLAGS by the buildlink.mk files so remove the extra
 definitions to add them from the package Makefiles.  As advised by the
 bsd.buildlink.mk file, also ensure that the buildlink.mk files are included
 prior to defining any package-specific CFLAGS/LDFLAGS to ensure that the
 buildlink directories are at the head of the compiler search paths.

---
 misc/chipmunk/Makefile          | 5 +----
 misc/py-readline/Makefile       | 6 +++---
 misc/py-readline/files/Setup.in | 6 +++---
 3 files changed, 7 insertions(+), 10 deletions(-)

(limited to 'misc')

diff --git a/misc/chipmunk/Makefile b/misc/chipmunk/Makefile
index fcc3cecaf52..abd6f22fc92 100644
--- a/misc/chipmunk/Makefile
+++ b/misc/chipmunk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/06/10 00:08:46 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2001/06/11 02:05:12 jlam Exp $
 #
 
 DISTNAME=       chipmunk-1.4
@@ -17,9 +17,6 @@ ALL_TARGET=	chipmunk
 MAKE_ENV+=	CONFIG_OPTIONS="${CPPFLAGS}"
 MAKE_ENV+=	EXTRA_LIBS=-li386
 
-CPPFLAGS+=	-I${BUILDLINK_INCDIR}
-LDFLAGS+=	-L${BUILDLINK_LIBDIR}
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/chipmunk ${PREFIX}/sbin/chipmunk
 
diff --git a/misc/py-readline/Makefile b/misc/py-readline/Makefile
index 0fcb2d3511f..d8465216641 100644
--- a/misc/py-readline/Makefile
+++ b/misc/py-readline/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2001/06/10 00:08:46 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2001/06/11 02:05:12 jlam Exp $
 #
 
 DISTNAME=	${PY_DISTNAME}
@@ -17,8 +17,8 @@ USE_GNU_READLINE=	# defined
 
 .include "../../devel/readline/buildlink.mk"
 
-PY_SETUP_SUBST+=	BUILDLINK_INCDIR=${BUILDLINK_INCDIR}
-PY_SETUP_SUBST+=	BUILDLINK_LIBDIR=${BUILDLINK_LIBDIR}
+PY_SETUP_SUBST+=	BUILDLINK_CPPFLAGS=${BUILDLINK_CPPFLAGS}
+PY_SETUP_SUBST+=	BUILDLINK_LDFLAGS=${BUILDLINK_LDFLAGS}
 
 do-configure:	python-std-do-configure
 
diff --git a/misc/py-readline/files/Setup.in b/misc/py-readline/files/Setup.in
index 15ec3f86459..45c63d96042 100644
--- a/misc/py-readline/files/Setup.in
+++ b/misc/py-readline/files/Setup.in
@@ -1,5 +1,5 @@
-# $NetBSD: Setup.in,v 1.4 2001/05/30 05:02:52 jlam Exp $
+# $NetBSD: Setup.in,v 1.5 2001/06/11 02:05:13 jlam Exp $
 #
 *shared*
-readline readline.c -L@BUILDLINK_LIBDIR@ -R@LOCALBASE@/lib \
-	-I@BUILDLINK_INCDIR@ -lreadline -ltermcap
+readline readline.c @BUILDLINK_LDFLAGS@ -R@LOCALBASE@/lib \
+	@BUILDLINK_CPPFLAGS@ -lreadline -ltermcap
-- 
cgit v1.2.3