[pkgsrc/trunk]: pkgsrc/mk Reverted the change that moved the definition of MA...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d013543d3eed
branches:  trunk
changeset: 503055:d013543d3eed
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sun Nov 13 17:40:00 2005 +0000

description:
Reverted the change that moved the definition of MANINSTALL from mk.conf to
bsd.prefs.mk. Alistair has told me that Stoned had told him that MANINSTALL
actually belongs to 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 54f683780179 -r d013543d3eed mk/bsd.prefs.mk
--- a/mk/bsd.prefs.mk   Sun Nov 13 17:39:05 2005 +0000
+++ b/mk/bsd.prefs.mk   Sun Nov 13 17:40:00 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.207 2005/11/10 09:55:21 rillig Exp $
+# $NetBSD: bsd.prefs.mk,v 1.208 2005/11/13 17:40:00 rillig Exp $
 #
 # Make file, included to get the site preferences, if any.  Should
 # only be included by package Makefiles before any .if defined()
@@ -607,9 +607,4 @@
 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 54f683780179 -r d013543d3eed mk/defaults/mk.conf
--- a/mk/defaults/mk.conf       Sun Nov 13 17:39:05 2005 +0000
+++ b/mk/defaults/mk.conf       Sun Nov 13 17:40:00 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.88 2005/11/10 10:37:47 rillig Exp $
+# $NetBSD: mk.conf,v 1.89 2005/11/13 17:40:00 rillig Exp $
 #
 
 # This file provides default values for variables that may be overridden
@@ -20,6 +20,11 @@
 # 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