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. --- audio/xmms-dscope/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'audio/xmms-dscope') diff --git a/audio/xmms-dscope/Makefile b/audio/xmms-dscope/Makefile index cfbb302a75a..0964440227b 100644 --- a/audio/xmms-dscope/Makefile +++ b/audio/xmms-dscope/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2001/10/23 13:14:44 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2001/10/24 22:10:45 jlam Exp $ # DISTNAME= dscope-1.2 @@ -16,6 +16,6 @@ USE_LIBTOOL= YES pre-build: cd ${WRKSRC} ; ${MAKE} clean -.include "../../mk/x11.buildlink.mk" .include "../../audio/xmms/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" -- cgit v1.2.3