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. --- audio/gmp3info/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'audio/gmp3info') diff --git a/audio/gmp3info/Makefile b/audio/gmp3info/Makefile index a10857ad012..c28e6f846e7 100644 --- a/audio/gmp3info/Makefile +++ b/audio/gmp3info/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/10/23 13:14:43 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2001/10/24 22:10:43 jlam Exp $ DISTNAME= mp3info-0.8.2 PKGNAME= g${DISTNAME} @@ -24,7 +24,7 @@ HAVE_WGETNSTR!= ${GREP} -cw wgetnstr /usr/include/curses.h || ${TRUE} USE_NCURSES= YES .endif -.include "../../mk/x11.buildlink.mk" .include "../../devel/ncurses/buildlink.mk" .include "../../x11/gtk/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" -- cgit v1.2.3