diff options
| author | jlam <jlam@pkgsrc.org> | 2005-03-24 22:42:58 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2005-03-24 22:42:58 +0000 |
| commit | 5d8b60393d2dcf7160d23e21a916a0e8da4734b9 (patch) | |
| tree | d7fe497052393fc66a0643bdff66b2bf686bec43 /textproc | |
| parent | 5e4d5571a561bf26bbd174d7ab0d281a5e49c219 (diff) | |
| download | pkgsrc-5d8b60393d2dcf7160d23e21a916a0e8da4734b9.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')
| -rw-r--r-- | textproc/scrollkeeper/omf.mk | 10 | ||||
| -rw-r--r-- | textproc/xmlcatmgr/catalogs.mk | 6 |
2 files changed, 5 insertions, 11 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 diff --git a/textproc/xmlcatmgr/catalogs.mk b/textproc/xmlcatmgr/catalogs.mk index c5fa6d4d2a1..b2b283dcdec 100644 --- a/textproc/xmlcatmgr/catalogs.mk +++ b/textproc/xmlcatmgr/catalogs.mk @@ -1,4 +1,4 @@ -# $NetBSD: catalogs.mk,v 1.8 2004/05/06 14:39:05 minskim Exp $ +# $NetBSD: catalogs.mk,v 1.9 2005/03/24 22:42:59 jlam Exp $ # # This Makefile fragment is intended to be included by packages that install # catalog files or DTDs. It takes care of registering them into the right @@ -61,8 +61,6 @@ PRINT_PLIST_AWK+= /^share\/(sgml|xml)\/catalog$$/ \ PRINT_PLIST_AWK+= /^@dirrm share\/(sgml|xml)$$/ \ { print "@comment in xmlcatmgr: " $$0; next; } -.if !empty(USE_BUILDLINK3:M[yY][eE][sS]) -. include "../../textproc/xmlcatmgr/buildlink3.mk" -.endif +.include "../../textproc/xmlcatmgr/buildlink3.mk" .endif # XMLCATMGR_CATALOGS_MK |