summaryrefslogtreecommitdiff
path: root/pkgtools
diff options
context:
space:
mode:
authorjlam <jlam>2001-12-21 16:22:53 +0000
committerjlam <jlam>2001-12-21 16:22:53 +0000
commit13c5d97eeeab2ddcfc9e1eb1003610a0682caa26 (patch)
treed4b0b79633f628ad7efdc25c2b0374b937c2a04a /pkgtools
parente95ecc5e51dd315bb8186a3cf4e5931f0a83a9af (diff)
downloadpkgsrc-13c5d97eeeab2ddcfc9e1eb1003610a0682caa26.tar.gz
Add a guard to prevent packages other than x11-links from using the
x11-links/buildlink.mk file.
Diffstat (limited to 'pkgtools')
-rw-r--r--pkgtools/x11-links/Makefile4
-rw-r--r--pkgtools/x11-links/buildlink.mk4
2 files changed, 6 insertions, 2 deletions
diff --git a/pkgtools/x11-links/Makefile b/pkgtools/x11-links/Makefile
index f9068713fc0..221a376da5b 100644
--- a/pkgtools/x11-links/Makefile
+++ b/pkgtools/x11-links/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/12/08 23:15:36 kristerw Exp $
+# $NetBSD: Makefile,v 1.7 2001/12/21 16:22:53 jlam Exp $
#
# NOTE: If you update this package, then you'll likely need to also update
# the x11-links dependency in x11.buildlink.mk to the correct version,
@@ -23,6 +23,8 @@ USE_X11= # defined
PLIST_SRC= ${WRKDIR}/.PLIST_SRC
BUILDLINK_X11_SUBDIR= share/x11-links
+_FOR_X11_LINKS_ONLY=- # needed to use x11-links/buildlink.mk
+
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/${BUILDLINK_X11_SUBDIR}
cd ${BUILDLINK_DIR} && \
diff --git a/pkgtools/x11-links/buildlink.mk b/pkgtools/x11-links/buildlink.mk
index a6a5a222ad8..b826514261c 100644
--- a/pkgtools/x11-links/buildlink.mk
+++ b/pkgtools/x11-links/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.6 2001/12/17 09:38:07 tron Exp $
+# $NetBSD: buildlink.mk,v 1.7 2001/12/21 16:22:53 jlam Exp $
#
# This Makefile fragment is included by packages that use X11.
#
@@ -10,6 +10,7 @@
# (3) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search
# path.
+.if defined(_FOR_X11_LINKS_ONLY)
.if !defined(X11_LINKS_BUILDLINK_MK)
X11_LINKS_BUILDLINK_MK= # defined
@@ -1519,3 +1520,4 @@ pre-configure: ${BUILDLINK_TARGETS.X11}
X11-buildlink: _BUILDLINK_USE
.endif # X11_LINKS_BUILDLINK_MK
+.endif # _FOR_X11_LINKS_ONLY