diff options
| author | jlam <jlam> | 2003-09-12 10:49:28 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2003-09-12 10:49:28 +0000 |
| commit | 3c02e9504de444d63ff82555cd738e05b8cb75bc (patch) | |
| tree | 89949edb712134a4c13a9a15d43fe0efbe950b1c /mk | |
| parent | 0164aa7026215a4b5a699ea067174c2fb6e1249f (diff) | |
| download | pkgsrc-3c02e9504de444d63ff82555cd738e05b8cb75bc.tar.gz | |
Move the default settings for USE_BUILDLINK[23] from bsd.pkg.mk into
bsd.prefs.mk so that they may be tested/used in buildlink[23].mk files.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 7 | ||||
| -rw-r--r-- | mk/bsd.prefs.mk | 8 |
2 files changed, 8 insertions, 7 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 160e99abc96..37f78490ab5 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1270 2003/09/12 05:15:04 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1271 2003/09/12 10:49:28 jlam Exp $ # # This file is in the public domain. # @@ -121,11 +121,6 @@ PKG_FAIL_REASON+= "PLIST_TYPE must be \`\`dynamic'' or \`\`static''." PKG_FAIL_REASON+= "PLIST_TYPE must be \`\`static'' for \`\`overwrite'' packages." .endif -USE_BUILDLINK2?= no # default to not using buildlink2 -USE_BUILDLINK3?= no # default to not using buildlink3 -.if ${PKG_INSTALLATION_TYPE} == "pkgviews" -USE_BUILDLINK3= yes # pkgviews requires buildlink3 -.endif .if empty(USE_BUILDLINK2:M[nN][oO]) && empty(USE_BUILDLINK3:M[nN][oO]) PKG_FAIL_REASON+= "Please undefine USE_BUILDLINK2 or USE_BUILDLINK3." .endif diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index 604f36f3d73..77bb7b35c37 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.122 2003/09/02 06:59:44 jlam Exp $ +# $NetBSD: bsd.prefs.mk,v 1.123 2003/09/12 10:49:31 jlam Exp $ # # Make file, included to get the site preferences, if any. Should # only be included by package Makefiles before any .if defined() @@ -290,6 +290,12 @@ PKG_INSTALLATION_TYPE?= ${PKG_INSTALLATION_TYPES:M${_pref_}:S/^/_pkginsttype_/1: .endfor PKG_INSTALLATION_TYPE?= none +USE_BUILDLINK2?= no # default to not using buildlink2 +USE_BUILDLINK3?= no # default to not using buildlink3 +.if ${PKG_INSTALLATION_TYPE} == "pkgviews" +USE_BUILDLINK3= yes # pkgviews requires buildlink3 +.endif + # This is the package database directory for the default view. PKG_DBDIR?= ${DESTDIR}/var/db/pkg |