[pkgsrc/trunk]: pkgsrc/mk Moved default definition of MANINSTALL from default...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/983600c61ec5
branches:  trunk
changeset: 502881:983600c61ec5
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Thu Nov 10 09:55:21 2005 +0000

description:
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:

 mk/bsd.prefs.mk     |  7 ++++++-
 mk/defaults/mk.conf |  7 +------
 2 files changed, 7 insertions(+), 7 deletions(-)

diffs (40 lines):

diff -r 924754427b7a -r 983600c61ec5 mk/bsd.prefs.mk
--- a/mk/bsd.prefs.mk   Thu Nov 10 09:48:04 2005 +0000
+++ b/mk/bsd.prefs.mk   Thu Nov 10 09:55:21 2005 +0000
@@ -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 @@
 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 -r 924754427b7a -r 983600c61ec5 mk/defaults/mk.conf
--- a/mk/defaults/mk.conf       Thu Nov 10 09:48:04 2005 +0000
+++ b/mk/defaults/mk.conf       Thu Nov 10 09:55:21 2005 +0000
@@ -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