Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enable MKHTML by default; we now install the HTML version of the man 

pages as well as the source & catman versions.
Add "htmlinstall" to default MANINSTALL, so MKHTML will operate correctly.
This commit is contained in:
lukem 2008-08-31 01:21:41 +00:00
parent bee9ff71a1
commit e425ce2906
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
share/mk/bsd.README
View File

@ -1,4 +1,4 @@
# $NetBSD: bsd.README,v 1.221 2008/08/28 07:53:53 mrg Exp $
# $NetBSD: bsd.README,v 1.222 2008/08/31 01:21:41 lukem Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make "include" files for the NetBSD
@ -170,8 +170,8 @@ MKHOSTOBJ If not "no", for programs intended to be run on the compile
directory created by "make obj".
Default: no
MKHTML If "no", don't build or install the html man pages.
Default: no
MKHTML If "no", don't build or install the HTML man pages.
Default: yes
MKIEEEFP If "no", don't add code for IEEE754/IEC60559 conformance.
Has no effect on most platforms.
@ -451,8 +451,9 @@ MANOWN Manual owner. [root]
MANMODE Manual mode. [${NONBINMODE}]
MANINSTALL Manual installation type: maninstall, catinstall, or both
[maninstall catinstall]
MANINSTALL Manual installation type. Space separated list:
catinstall, htmlinstall, maninstall
[catinstall maninstall htmlinstall]
LDSTATIC Control program linking; if set blank, link everything
dynamically. If set to "-static", link everything statically.
@ -887,12 +888,14 @@ CONFIGSYMLINKS Similar semantics to SYMLINKS, except that the symbolic links
The include file <bsd.man.mk> handles installing manual pages and their
links.
It has a two targets:
It has a three targets:
maninstall:
Install the manual page sources and their links.
catinstall:
Install the preformatted manual pages and their links.
htmlinstall:
Install the HTML manual pages and their links.
maninstall:
Install the manual page sources and their links.
It sets/uses the following variables:

7
share/mk/bsd.own.mk
View File

@ -1,4 +1,4 @@
# $NetBSD: bsd.own.mk,v 1.523 2008/08/30 09:13:35 mrg Exp $
# $NetBSD: bsd.own.mk,v 1.524 2008/08/31 01:21:41 lukem Exp $
.if !defined(_BSD_OWN_MK_)
_BSD_OWN_MK_=1
@ -339,7 +339,7 @@ MANDIR?= /usr/share/man
MANGRP?= wheel
MANOWN?= root
MANMODE?= ${NONBINMODE}
MANINSTALL?= maninstall catinstall
MANINSTALL?= catinstall htmlinstall maninstall
INFODIR?= /usr/share/info
INFOGRP?= wheel
@ -563,7 +563,7 @@ MK${var}:= yes
MKCATPAGES MKCRYPTO MKCOMPLEX MKCVS \
MKDOC \
MKGCC MKGCCCMDS MKGDB \
MKHESIOD \
MKHESIOD MKHTML \
MKIEEEFP MKINET6 MKINFO MKIPFILTER MKISCSI \
MKKERBEROS \
MKLDAP MKLINKLIB MKLINT \
@ -582,7 +582,6 @@ ${var}?= yes
#
.for var in \
MKCRYPTO_IDEA MKCRYPTO_MDC2 MKCRYPTO_RC5 MKDEBUG MKDEBUGLIB \
MKHTML \
MKMANZ MKMODULAR MKOBJDIRS \
MKPCC MKPCCCMDS \
MKPUFFS MKSOFTFLOAT \