From a4bc16d30c123e03c4125fdd70bde0eb8a71f4a4 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. --- comms/pilot-link/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'comms/pilot-link') diff --git a/comms/pilot-link/Makefile b/comms/pilot-link/Makefile index 6dd64cd53f0..735e9f97f21 100644 --- a/comms/pilot-link/Makefile +++ b/comms/pilot-link/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2001/10/23 20:46:46 jlam Exp $ +# $NetBSD: Makefile,v 1.26 2001/10/24 22:10:49 jlam Exp $ # .include "../../comms/pilot-link/Makefile.common" @@ -21,9 +21,9 @@ LIBS+= -lpisock -liconv INSTALL_TARGET= install-execs install-man -.include "../../mk/x11.buildlink.mk" .include "../../comms/pilot-link-libs/buildlink.mk" .include "../../devel/readline/buildlink.mk" .include "../../lang/tcl/buildlink.mk" .include "../../x11/tk/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" -- cgit v1.2.3