summaryrefslogtreecommitdiff
path: root/textproc/scrollkeeper
diff options
context:
space:
mode:
authorjlam <jlam>2005-03-24 22:42:58 +0000
committerjlam <jlam>2005-03-24 22:42:58 +0000
commitf117b3380384486f8646a610a1a3345362caa377 (patch)
treed7fe497052393fc66a0643bdff66b2bf686bec43 /textproc/scrollkeeper
parent9d47c4400465d555ff016e6e4642d1cc9297d4d9 (diff)
downloadpkgsrc-f117b3380384486f8646a610a1a3345362caa377.tar.gz
Don't check for USE_BUILDLINK3 anymore in these files. These are included
by other package Makefiles, and with the deprecation of USE_BUILDLINK3 support in the infrastructure files, these had the potential to break existing packages.
Diffstat (limited to 'textproc/scrollkeeper')
-rw-r--r--textproc/scrollkeeper/omf.mk10
1 files changed, 3 insertions, 7 deletions
diff --git a/textproc/scrollkeeper/omf.mk b/textproc/scrollkeeper/omf.mk
index 431ebb2645a..a3f48d39ad0 100644
--- a/textproc/scrollkeeper/omf.mk
+++ b/textproc/scrollkeeper/omf.mk
@@ -1,4 +1,4 @@
-# $NetBSD: omf.mk,v 1.7 2004/04/27 01:26:29 wiz Exp $
+# $NetBSD: omf.mk,v 1.8 2005/03/24 22:42:58 jlam Exp $
#
# This Makefile fragment is intended to be included by packages that install
# OMF files. It takes care of registering them in scrollkeeper's global
@@ -13,7 +13,7 @@
.if !defined(SCROLLKEEPER_OMF_MK)
SCROLLKEEPER_OMF_MK= # defined
-. include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.prefs.mk"
# scrollkeeper's data directory.
SCROLLKEEPER_DATADIR= ${BUILDLINK_PREFIX.scrollkeeper}/libdata/scrollkeeper
@@ -36,10 +36,6 @@ PRINT_PLIST_AWK+= /^@dirrm share\/omf$$/ \
{ print "@comment in scrollkeeper: " $$0; \
next; }
-.if !defined(NO_BUILDLINK)
-. if !empty(USE_BUILDLINK3:M[yY][eE][sS])
-. include "../../textproc/scrollkeeper/buildlink3.mk"
-. endif
-.endif
+.include "../../textproc/scrollkeeper/buildlink3.mk"
.endif # SCROLLKEEPER_OMF_MK