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. --- devel/gcvs/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'devel/gcvs') diff --git a/devel/gcvs/Makefile b/devel/gcvs/Makefile index 43e6206c2b3..74f545a5ed1 100644 --- a/devel/gcvs/Makefile +++ b/devel/gcvs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/10/23 13:14:50 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2001/10/24 22:10:52 jlam Exp $ DISTNAME= gcvs-1.0a7 CATEGORIES= devel @@ -22,7 +22,7 @@ post-patch: ${MV} -f ${WRKSRC}/configure.done ${WRKSRC}/configure ${CHMOD} +x ${WRKSRC}/configure -.include "../../mk/x11.buildlink.mk" .include "../../lang/tcl/buildlink.mk" .include "../../x11/gtk/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" -- cgit v1.2.3