From bc639ff8499e23cfd4209397592a1f72b6455319 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Tue, 22 May 2001 16:09:14 +0000
Subject: Pass in CPPFLAGS through CFLAGS to the configure script to eventually
 pass then to libneon/Makefile.  Should now pick up libintl.h if it's not in
 the base system.  Noted by David Brownlee <abs@formula1.com>.

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

(limited to 'www')

diff --git a/www/cadaver/Makefile b/www/cadaver/Makefile
index e49d5599950..0d0822e3bec 100644
--- a/www/cadaver/Makefile
+++ b/www/cadaver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/05/22 15:22:20 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2001/05/22 16:09:14 jlam Exp $
 
 DISTNAME=		cadaver-0.17.0
 CATEGORIES=		www
@@ -24,13 +24,11 @@ CONFIGURE_ARGS+=	--enable-netrc
 .include "../../devel/libgetopt/Makefile.getopt"
 .include "../../devel/readline/Makefile.readline"
 
-CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
 CONFIGURE_ENV+=		LIBS="${LIBS}"
 CONFIGURE_ENV+=		ac_cv_lib_curses_tputs=no
 CONFIGURE_ENV+=		ac_cv_lib_ncurses_tputs=no
 
-CPPFLAGS+=		-I${WRKINCDIR}
-CFLAGS+=		-I${WRKINCDIR}
+CFLAGS+=		-I${WRKINCDIR} ${CPPFLAGS}
 LDFLAGS+=		-L${WRKLIBDIR}
 LIBS+=			-ltermcap
 
diff --git a/www/sitecopy/Makefile b/www/sitecopy/Makefile
index cf4dd12d9ee..6954f145a44 100644
--- a/www/sitecopy/Makefile
+++ b/www/sitecopy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/05/22 15:22:21 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2001/05/22 16:09:14 jlam Exp $
 
 DISTNAME=		sitecopy-0.10.15
 CATEGORIES=		www
@@ -21,9 +21,7 @@ CONFIGURE_ARGS+=	--enable-libxml
 
 .include "../../devel/libgetopt/Makefile.getopt"
 
-CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
-CPPFLAGS+=		-I${WRKINCDIR}
-CFLAGS+=		-I${WRKINCDIR}
+CFLAGS+=		-I${WRKINCDIR} ${CPPFLAGS}
 
 pre-configure: link-getopt-headers
 
-- 
cgit v1.2.3