Module Name: src
Committed By: riz
Date: Sat Feb 18 18:05:06 UTC 2012
Modified Files:
src/share/mk [netbsd-6]: bsd.README bsd.own.mk
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.292 -r1.292.2.1 src/share/mk/bsd.README
cvs rdiff -u -r1.696 -r1.696.2.1 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.README
diff -u src/share/mk/bsd.README:1.292 src/share/mk/bsd.README:1.292.2.1
--- src/share/mk/bsd.README:1.292 Tue Feb 7 22:58:49 2012
+++ src/share/mk/bsd.README Sat Feb 18 18:05:06 2012
@@ -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 @@ MANMODE Manual mode. [${NONBINMODE}]
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.
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.696 src/share/mk/bsd.own.mk:1.696.2.1
--- src/share/mk/bsd.own.mk:1.696 Fri Feb 10 05:57:42 2012
+++ src/share/mk/bsd.own.mk Sat Feb 18 18:05:05 2012
@@ -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 @@ MANDIR?= /usr/share/man
MANGRP?= wheel
MANOWN?= root
MANMODE?= ${NONBINMODE}
-MANINSTALL?= catinstall htmlinstall maninstall
+MANINSTALL?= ${_MANINSTALL}
INFODIR?= /usr/share/info
INFOGRP?= wheel
@@ -883,6 +883,14 @@ MKCATPAGES:= no
MKHTML:= no
.endif
+_MANINSTALL= maninstall
+.if ${MKCATPAGES} != "no"
+_MANINSTALL+= catinstall
+.endif
+.if ${MKHTML} != "no"
+_MANINSTALL+= htmlinstall
+.endif
+
.if ${MKLINKLIB} == "no"
MKLINT:= no
MKPICINSTALL:= no
