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

Add MKMANZ; if not set to "no", compress the manual pages at installation time.

Browse Source 
This replaces the previous  .if defined (MANZ) behaviour, although the latter
will set MKMANZ=yes for compatibility purposes.

Don't bother with -P-bou in TOOL_ROFF_HTML; it doesn't appear to be
necessary with groff 1.19.

Fix NOHTML implementation to be consistent with other NOxxx / MKxxx
variables, and expose the user-tweakable MKHTML.
This commit is contained in:
lukem 2003-07-18 02:52:51 +00:00
parent 7a719d0e4e
commit 4d63406463
4 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
share/mk/bsd.README
View File

@ -1,4 +1,4 @@
# $NetBSD: bsd.README,v 1.118 2003/07/18 00:33:18 lukem Exp $
# $NetBSD: bsd.README,v 1.119 2003/07/18 02:52:51 lukem Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the new make "include" files for the BSD
@ -118,6 +118,9 @@ MKLINT If "no", don't build or install the lint libraries.
MKMAN If "no", don't build or install the man or catman pages.
Also acts as "MKCATPAGES=no"
MKMANZ If not "no", compress manual pages at installation time.
"no" by default.
MKNLS If "no", don't build or install the NLS files and locale
definition files.
@ -302,8 +305,6 @@ USE_YP If set to "no", disables building YP (NIS) support into
various system utilities/libraries that support it. If
MKYP is set to "no", USE_YP will also be forced to "no".
MANZ Compress manual pages at installation time.
NOPROFILE Do not build profiled versions of system libraries
NOPIC Do not build PIC versions of system libraries, and
@ -983,7 +984,7 @@ TOOL_ROFF_ASCII Generate ASCII groff output. [nroff]
TOOL_ROFF_DVI Generate DVI groff output. [${TOOL_GROFF} -Tdvi]
TOOL_ROFF_HTML Generate HTML groff output.
[${TOOL_GROFF} -Tlatin1 -mdoc2html -P-b -P-o -P-u]
[${TOOL_GROFF} -Tlatin1 -mdoc2html]
TOOL_ROFF_PS Generate PS groff output. [${TOOL_GROFF} -Tps]

15
share/mk/bsd.man.mk
View File

@ -1,4 +1,4 @@
# $NetBSD: bsd.man.mk,v 1.81 2003/07/10 10:34:36 lukem Exp $
# $NetBSD: bsd.man.mk,v 1.82 2003/07/18 02:52:51 lukem Exp $
# @(#)bsd.man.mk 8.1 (Berkeley) 6/8/93
.include <bsd.init.mk>
@ -30,8 +30,13 @@ MLINKS?=
_MNUMBERS= 1 2 3 4 5 6 7 8 9
.SUFFIXES: ${_MNUMBERS:@N@.$N@}
MANCOMPRESS?= ${MANZ:Dgzip -cf}
MANSUFFIX?= ${MANZ:D.gz}
.if ${MKMANZ} == "no"
MANCOMPRESS?=
MANSUFFIX?=
.else
MANCOMPRESS?= gzip -cf
MANSUFFIX?= .gz
.endif
# make MANCOMPRESS a filter, so it can be inserted on an as-needed basis
.if !empty(MANCOMPRESS)
@ -159,7 +164,7 @@ catlinks: catpages # symlink install
##### Build and install rules (HTML pages)
.if !defined(NOHTML)
.if ${MKHTML} != "no" # {
installhtml: htmlpages
htmlpages:: # ensure target exists
HTMLPAGES= ${MAN:C/\.([1-9])$/.html\1/}
@ -194,7 +199,7 @@ htmlpages:: ${_F}
cleanhtml:
rm -f ${HTMLPAGES}
.endif # !defined(NOHTML)
.endif # }
##### Clean rules
.undef _F

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

@ -1,4 +1,4 @@
# $NetBSD: bsd.own.mk,v 1.339 2003/07/16 13:19:49 lukem Exp $
# $NetBSD: bsd.own.mk,v 1.340 2003/07/18 02:52:51 lukem Exp $
.if !defined(_BSD_OWN_MK_)
_BSD_OWN_MK_=1
@ -200,7 +200,7 @@ TOOL_PWD_MKDB= ${TOOLDIR}/bin/${_TOOL_PREFIX}pwd_mkdb
TOOL_REFER= ${TOOLDIR}/bin/${_TOOL_PREFIX}refer
TOOL_ROFF_ASCII= PATH=${TOOLDIR}/lib/groff:$${PATH} ${TOOLDIR}/bin/${_TOOL_PREFIX}nroff
TOOL_ROFF_DVI= ${TOOL_GROFF} -Tdvi
TOOL_ROFF_HTML= ${TOOL_GROFF} -Tlatin1 -mdoc2html -P-b -P-o -P-u
TOOL_ROFF_HTML= ${TOOL_GROFF} -Tlatin1 -mdoc2html
TOOL_ROFF_PS= ${TOOL_GROFF} -Tps
TOOL_ROFF_RAW= ${TOOL_GROFF} -Z
TOOL_RPCGEN= CPP=${CPP:Q} ${TOOLDIR}/bin/${_TOOL_PREFIX}rpcgen
@ -265,9 +265,6 @@ BINOWN?= root
BINMODE?= 555
NONBINMODE?= 444
# Define MANZ to have the man pages compressed (gzip)
#MANZ= 1
MANDIR?= /usr/share/man
MANGRP?= wheel
MANOWN?= root
@ -461,29 +458,30 @@ dependall: .NOTMAIN realdepend .MAKE
# Define MKxxx variables (which are either yes or no) for users
# to set in /etc/mk.conf and override on the make commandline.
# These should be tested with `== "no"' or `!= "no"'.
# The NOxxx variables should only be used by Makefiles.
# The NOxxx variables should only be set by Makefiles.
#
# Supported NO* options (if defined, MK* will be forced to "no",
# regardless of user's mk.conf setting).
.for var in CRYPTO DOC LINKLIB LINT MAN NLS OBJ PIC PICINSTALL PROFILE SHARE
.for var in CRYPTO DOC HTML LINKLIB LINT MAN NLS OBJ PIC PICINSTALL PROFILE \
SHARE
.if defined(NO${var})
MK${var}:= no
.endif
.endfor
.if defined(NOMAN)
NOHTML=
.if defined(MANZ)
MKMANZ:= yes
.endif
# MK* options which default to "yes".
.for var in BFD CATPAGES CRYPTO DOC GCC GDB HESIOD IEEEFP INFO KERBEROS \
.for var in BFD CATPAGES CRYPTO DOC GCC GDB HESIOD HTML IEEEFP INFO KERBEROS \
LINKLIB LINT MAN NLS OBJ PIC PICINSTALL PICLIB PROFILE SHARE SKEY YP
MK${var}?= yes
.endfor
# MK* options which default to "no".
.for var in CRYPTO_IDEA CRYPTO_MDC2 CRYPTO_RC5 OBJDIRS SOFTFLOAT
.for var in CRYPTO_IDEA CRYPTO_MDC2 CRYPTO_RC5 MANZ OBJDIRS SOFTFLOAT
MK${var}?= no
.endfor
@ -492,6 +490,10 @@ MK${var}?= no
MKKERBEROS:= no
.endif
.if ${MKMAN} == "no"
MKHTML:= no
.endif
.if ${MKLINKLIB} == "no"
MKPICINSTALL:= no
MKPROFILE:= no

4
share/mk/bsd.sys.mk
View File

@ -1,4 +1,4 @@
# $NetBSD: bsd.sys.mk,v 1.90 2003/07/14 00:41:17 lukem Exp $
# $NetBSD: bsd.sys.mk,v 1.91 2003/07/18 02:52:52 lukem Exp $
#
# Build definitions used for NetBSD source tree builds.
@ -118,7 +118,7 @@ TOOL_PWD_MKDB?= pwd_mkdb
TOOL_REFER?= refer
TOOL_ROFF_ASCII?= nroff
TOOL_ROFF_DVI?= ${TOOL_GROFF} -Tdvi
TOOL_ROFF_HTML?= ${TOOL_GROFF} -Tlatin1 -mdoc2html -P-b -P-o -P-u
TOOL_ROFF_HTML?= ${TOOL_GROFF} -Tlatin1 -mdoc2html
TOOL_ROFF_PS?= ${TOOL_GROFF} -Tps
TOOL_ROFF_RAW?= ${TOOL_GROFF} -Z
TOOL_RPCGEN?= rpcgen