[src/netbsd-6]: src/share/mk Pull up following revision(s) (requested by joer...

[riz <riz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/938de402ee28
branches:  netbsd-6
changeset: 773770:938de402ee28
user:      riz <riz%NetBSD.org@localhost>
date:      Sat Feb 18 18:05:05 2012 +0000

description:
Pull up following revision(s) (requested by joerg in ticket #5):
        share/mk/bsd.own.mk: revision 1.697
        share/mk/bsd.README: revision 1.293
Derive MANINSTALL from MKCATPAGES and MKHTML.

diffstat:

 share/mk/bsd.README |   4 ++--
 share/mk/bsd.own.mk |  12 ++++++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diffs (51 lines):

diff -r 9e4eb2689dbb -r 938de402ee28 share/mk/bsd.README
--- a/share/mk/bsd.README       Sat Feb 18 18:03:26 2012 +0000
+++ b/share/mk/bsd.README       Sat Feb 18 18:05:05 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.README,v 1.292 2012/02/07 22:58:49 joerg Exp $
+#      $NetBSD: bsd.README,v 1.292.2.1 2012/02/18 18:05:06 riz Exp $
 #      @(#)bsd.README  8.2 (Berkeley) 4/2/94
 
 This is the README file for the make "include" files for the NetBSD
@@ -512,7 +512,7 @@
 
 MANINSTALL     Manual installation type.  Space separated list:
                        catinstall, htmlinstall, maninstall
-               [catinstall maninstall htmlinstall]
+               Default value derived from MKCATPAGES and MKHTML.
 
 LDSTATIC       Control program linking; if set blank, link everything
                dynamically.  If set to "-static", link everything statically.
diff -r 9e4eb2689dbb -r 938de402ee28 share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk       Sat Feb 18 18:03:26 2012 +0000
+++ b/share/mk/bsd.own.mk       Sat Feb 18 18:05:05 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.own.mk,v 1.696 2012/02/10 05:57:42 matt Exp $
+#      $NetBSD: bsd.own.mk,v 1.696.2.1 2012/02/18 18:05:05 riz Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -525,7 +525,7 @@
 MANGRP?=       wheel
 MANOWN?=       root
 MANMODE?=      ${NONBINMODE}
-MANINSTALL?=   catinstall htmlinstall maninstall
+MANINSTALL?=   ${_MANINSTALL}
 
 INFODIR?=      /usr/share/info
 INFOGRP?=      wheel
@@ -883,6 +883,14 @@
 MKHTML:=       no
 .endif
 
+_MANINSTALL=   maninstall
+.if ${MKCATPAGES} != "no"
+_MANINSTALL+=  catinstall
+.endif
+.if ${MKHTML} != "no"
+_MANINSTALL+=  htmlinstall
+.endif
+
 .if ${MKLINKLIB} == "no"
 MKLINT:=       no
 MKPICINSTALL:= no