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.

---
 www/cadaver/Makefile  | 5 ++---
 www/sitecopy/Makefile | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'www')

diff --git a/www/cadaver/Makefile b/www/cadaver/Makefile
index 7e1d80c605f..8df5808d85e 100644
--- a/www/cadaver/Makefile
+++ b/www/cadaver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/06/10 00:08:48 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2001/06/11 02:05:15 jlam Exp $
 
 DISTNAME=		cadaver-0.17.0
 CATEGORIES=		www
@@ -28,8 +28,7 @@ CONFIGURE_ENV+=		LIBS="${LIBS}"
 CONFIGURE_ENV+=		ac_cv_lib_curses_tputs=no
 CONFIGURE_ENV+=		ac_cv_lib_ncurses_tputs=no
 
-CFLAGS+=		-I${BUILDLINK_INCDIR} ${CPPFLAGS}
-LDFLAGS+=		-L${BUILDLINK_LIBDIR}
+CFLAGS+=		${CPPFLAGS}
 LIBS+=			-ltermcap
 
 # The build process doesn't correctly find some headers for utility functions
diff --git a/www/sitecopy/Makefile b/www/sitecopy/Makefile
index f8557cf870f..74abb54ccee 100644
--- a/www/sitecopy/Makefile
+++ b/www/sitecopy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/06/10 00:08:49 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2001/06/11 02:05:15 jlam Exp $
 
 DISTNAME=		sitecopy-0.10.15
 CATEGORIES=		www
@@ -21,7 +21,7 @@ CONFIGURE_ARGS+=	--enable-libxml
 
 .include "../../devel/libgetopt/buildlink.mk"
 
-CFLAGS+=		-I${BUILDLINK_INCDIR} ${CPPFLAGS}
+CFLAGS+=		${CPPFLAGS}
 
 # The build process doesn't correctly find the header for GNU fnmatch, which
 # is provided in ${WRKSRC}/lib.  Help the compiler by linking the header
-- 
cgit v1.2.3