From b1cf2d6a0d781b36b3e41c1761bd09b0d1e714ae 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. --- x11/wmfire/Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'x11/wmfire') diff --git a/x11/wmfire/Makefile b/x11/wmfire/Makefile index fec59d171be..dfed1494c35 100644 --- a/x11/wmfire/Makefile +++ b/x11/wmfire/Makefile @@ -1,4 +1,4 @@ -#$NetBSD: Makefile,v 1.7 2001/06/29 08:51:20 zuntum Exp $ +#$NetBSD: Makefile,v 1.8 2001/08/29 22:41:31 jlam Exp $ # DISTNAME= wmfire-0.0.3.8 @@ -9,9 +9,7 @@ MAINTAINER= hubertf@netbsd.org COMMENT= Displays generated fire according to system load USE_BUILDLINK_ONLY= YES -USE_X11= YES -GNU_CONFIGURE= YES -CPPFLAGS+= -I${X11BASE}/include +GNU_CONFIGURE= YES post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/wmfire @@ -22,4 +20,5 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/INSTALL ${PREFIX}/share/doc/wmfire .include "../../graphics/xpm/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" -- cgit v1.2.3