From 63fc151cb9f15f8bcc66bbeca21050fea30c29d3 Mon Sep 17 00:00:00 2001 From: jlam Date: Wed, 29 Aug 2001 22:41:00 +0000 Subject: Use x11.buildlink.mk instead of USE_X11. Also convert hard-coded references to ${X11BASE} in the header and library search paths into references to ${LOCALBASE}/share/x11-links. These packages should now be strongly- buildlinked regardless of whether xpkgwedge is installed. Changes well-tested on NetBSD-1.5X/i386 with and without xpkgwedge and lightly-tested on NetBSD-1.5.1/alpha without xpkgwedge. --- sysutils/xps/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'sysutils/xps') diff --git a/sysutils/xps/Makefile b/sysutils/xps/Makefile index 4325538a1a8..be2e2ccf483 100644 --- a/sysutils/xps/Makefile +++ b/sysutils/xps/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2001/07/03 01:46:07 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2001/08/29 22:41:21 jlam Exp $ DISTNAME= xps-3.14 CATEGORIES= sysutils @@ -15,7 +15,8 @@ USE_X11BASE= # defined USE_BUILDLINK_ONLY= # defined GNU_CONFIGURE= # defined -CONFIGURE_ENV+= XINCLUDES="-I${X11BASE}/include" +CONFIGURE_ENV+= XINCLUDES="-I${BUILDLINK_X11_DIR}/include" .include "../../x11/lesstif/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" -- cgit v1.2.3