From 9d18cbcf3d344d366ec69d93d4b07cfec98c8420 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. --- x11/Xbae/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'x11/Xbae') diff --git a/x11/Xbae/Makefile b/x11/Xbae/Makefile index 02be864c87c..d9de519736f 100644 --- a/x11/Xbae/Makefile +++ b/x11/Xbae/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2001/10/23 13:15:06 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2001/10/24 22:11:11 jlam Exp $ # DISTNAME= Xbae-4.9.1 @@ -25,6 +25,6 @@ post-install: ${LN} -fs ${PREFIX}/share/aclocal/ac_find_xbae.m4 \ ${LOCALBASE}/share/aclocal/ac_find_xbae.m4 -.include "../../mk/x11.buildlink.mk" .include "../../mk/motif.buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" -- cgit v1.2.3