summaryrefslogtreecommitdiff
path: root/comms/pilot-link
diff options
context:
space:
mode:
authorjlam <jlam>2001-10-24 22:10:43 +0000
committerjlam <jlam>2001-10-24 22:10:43 +0000
commit9d18cbcf3d344d366ec69d93d4b07cfec98c8420 (patch)
treee280bcd13b77df59c664f968eda46414c756ada4 /comms/pilot-link
parenta2d21cd479d03393f90038ec217263fd6e918fbe (diff)
downloadpkgsrc-9d18cbcf3d344d366ec69d93d4b07cfec98c8420.tar.gz
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.
Diffstat (limited to 'comms/pilot-link')
-rw-r--r--comms/pilot-link/Makefile4
1 files changed, 2 insertions, 2 deletions
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"