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. --- games/kulki/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'games/kulki') diff --git a/games/kulki/Makefile b/games/kulki/Makefile index 42e56958db7..035b08473e1 100644 --- a/games/kulki/Makefile +++ b/games/kulki/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2001/10/23 13:14:53 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2001/10/24 22:10:56 jlam Exp $ # DISTNAME= kulki-1.01 @@ -29,6 +29,6 @@ do-install: cd ${PREFIX}/share/kulki && \ ( ${GUNZIP_CMD} -c ${WRKSRC}/images.tgz | ${GTAR} xf - ) -.include "../../mk/x11.buildlink.mk" .include "../../x11/qt2-libs/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" -- cgit v1.2.3