From 973189f9135fdd558ae1245181918d2289fce5b4 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/pacman/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'games/pacman') diff --git a/games/pacman/Makefile b/games/pacman/Makefile index 87d2ae7cdf0..3267db00b12 100644 --- a/games/pacman/Makefile +++ b/games/pacman/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2001/10/23 13:14:54 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2001/10/24 22:10:57 jlam Exp $ DISTNAME= Pacman-0.3-CVS-00-11-17 PKGNAME= Pacman-0.3 @@ -33,6 +33,6 @@ pre-build: exit 1; \ fi; -.include "../../mk/x11.buildlink.mk" .include "../../graphics/clanlib/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" -- cgit v1.2.3