From a4bc16d30c123e03c4125fdd70bde0eb8a71f4a4 Mon Sep 17 00:00:00 2001 From: jlam Date: Wed, 24 Oct 2001 22:10:43 +0000 Subject: I am a triple idiot. The only relevant variable that x11.buildlink.mk redefines about which buildlink.mk files would care is BUILDLINK_X11_DIR, which points to the location of the X11R6 hierarchy used during building. If x11.buildlink.mk isn't included, then BUILDLINK_X11_DIR defaults to ${X11BASE} (set in bsd.pkg.mk), so its value is always safe to use. Remove the ifdefs surrounding the use of BUILDLINK_X11_DIR in tk/buildlink.mk and revert changes to move x11.buildlink.mk before the other buildlink.mk files. --- wm/windowmaker/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'wm/windowmaker') diff --git a/wm/windowmaker/Makefile b/wm/windowmaker/Makefile index dfa8220189b..fbe51506501 100644 --- a/wm/windowmaker/Makefile +++ b/wm/windowmaker/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2001/10/23 13:15:05 jlam Exp $ +# $NetBSD: Makefile,v 1.23 2001/10/24 22:11:09 jlam Exp $ DISTNAME= WindowMaker-0.70.0 PKGNAME= windowmaker-0.70.0 @@ -79,7 +79,6 @@ post-install: FAQ FAQ.I18N \ ${PREFIX}/share/doc/WindowMaker -.include "../../mk/x11.buildlink.mk" .include "../../devel/gettext-lib/buildlink.mk" .include "../../graphics/hermes/buildlink.mk" .include "../../graphics/libungif/buildlink.mk" @@ -87,4 +86,5 @@ post-install: .include "../../graphics/png/buildlink.mk" .include "../../graphics/tiff/buildlink.mk" .include "../../graphics/xpm/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" -- cgit v1.2.3