diff options
| author | rillig <rillig> | 2005-11-10 09:55:21 +0000 |
|---|---|---|
| committer | rillig <rillig> | 2005-11-10 09:55:21 +0000 |
| commit | 32c8fbbdb43d05b9e987f8fcbf1bac083fd5fb96 (patch) | |
| tree | 6f098c9ffd65d6ff884395229a3fbfc0b53603c2 /mk | |
| parent | cd15ec6705beff0550d19eb834556392d6b77267 (diff) | |
| download | pkgsrc-32c8fbbdb43d05b9e987f8fcbf1bac083fd5fb96.tar.gz | |
Moved default definition of MANINSTALL from defaults/mk.conf to
bsd.prefs.mk, as it is not intended to be set in mk.conf.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.prefs.mk | 7 | ||||
| -rw-r--r-- | mk/defaults/mk.conf | 7 |
2 files changed, 7 insertions, 7 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index 9debf562e88..0bb2d5d6835 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.206 2005/11/10 09:48:04 rillig Exp $ +# $NetBSD: bsd.prefs.mk,v 1.207 2005/11/10 09:55:21 rillig Exp $ # # Make file, included to get the site preferences, if any. Should # only be included by package Makefiles before any .if defined() @@ -607,4 +607,9 @@ PREPEND_PATH+= ${USE_X11:D${X11BASE}/bin} ${LOCALBASE}/bin USE_TOOLS+= awk:pkgsrc cut:pkgsrc echo:pkgsrc pwd:pkgsrc \ sed:pkgsrc tr:pkgsrc uname:pkgsrc +MANINSTALL?= maninstall catinstall +# Specify manpage installation types. +# Possible: maninstall, catinstall, both types or empty +# Default: maninstall catinstall + .endif # BSD_PKG_MK diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf index cbcc6c04e99..b61cc264cd1 100644 --- a/mk/defaults/mk.conf +++ b/mk/defaults/mk.conf @@ -1,4 +1,4 @@ -# $NetBSD: mk.conf,v 1.86 2005/11/10 09:48:04 rillig Exp $ +# $NetBSD: mk.conf,v 1.87 2005/11/10 09:55:21 rillig Exp $ # # A file providing defaults for pkgsrc and the packages collection. @@ -16,11 +16,6 @@ # Possible: defined, not defined # Default: not defined -MANINSTALL?= maninstall catinstall -# Specify manpage installation types. -# Possible: maninstall, catinstall, both types or empty -# Default: maninstall catinstall - #MANZ= # gzip manual pages at installation time # Possible: defined, not defined |