Module Name: src
Committed By: njoly
Date: Tue Mar 8 12:20:17 UTC 2011
Modified Files:
src/share/mk: bsd.man.mk bsd.own.mk
Log Message:
Adjust html link template and css location for man pages in arch
subdirs.
To generate a diff of this commit:
cvs rdiff -u -r1.106 -r1.107 src/share/mk/bsd.man.mk
cvs rdiff -u -r1.652 -r1.653 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.man.mk
diff -u src/share/mk/bsd.man.mk:1.106 src/share/mk/bsd.man.mk:1.107
--- src/share/mk/bsd.man.mk:1.106 Wed Jan 12 23:03:24 2011
+++ src/share/mk/bsd.man.mk Tue Mar 8 12:20:17 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.man.mk,v 1.106 2011/01/12 23:03:24 joerg Exp $
+# $NetBSD: bsd.man.mk,v 1.107 2011/03/08 12:20:17 njoly Exp $
# @(#)bsd.man.mk 8.1 (Berkeley) 6/8/93
.include <bsd.init.mk>
@@ -189,13 +189,17 @@
htmlpages:: # ensure target exists
HTMLPAGES= ${MAN:C/\.([1-9])$/.html\1/}
+HTMLLINKS= ${MANSUBDIR:?../:}../html%S/%N.html
+HTMLSTYLE= ${MANSUBDIR:?../:}../style.css
+
realall: ${HTMLPAGES}
.NOPATH: ${HTMLPAGES}
.SUFFIXES: ${_MNUMBERS:@N@.html$N@}
${_MNUMBERS:@N@.$N.html$N@}: # build rule
${_MKTARGET_FORMAT}
- ${TOOL_MANDOC_HTML} ${.IMPSRC} > ${.TARGET}.tmp && \
+ ${TOOL_MANDOC_HTML} -Oman=${HTMLLINKS} -Ostyle=${HTMLSTYLE} \
+ ${.IMPSRC} > ${.TARGET}.tmp && \
mv ${.TARGET}.tmp ${.TARGET}
.for F in ${HTMLPAGES:O:u}
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.652 src/share/mk/bsd.own.mk:1.653
--- src/share/mk/bsd.own.mk:1.652 Mon Feb 7 21:23:47 2011
+++ src/share/mk/bsd.own.mk Tue Mar 8 12:20:17 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.652 2011/02/07 21:23:47 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.653 2011/03/08 12:20:17 njoly Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -268,7 +268,7 @@
TOOL_MAKEINFO= ${TOOLDIR}/bin/${_TOOL_PREFIX}makeinfo
TOOL_MAKEWHATIS= ${TOOLDIR}/bin/${_TOOL_PREFIX}makewhatis
TOOL_MANDOC_ASCII= ${TOOLDIR}/bin/${_TOOL_PREFIX}mandoc -Tascii
-TOOL_MANDOC_HTML= ${TOOLDIR}/bin/${_TOOL_PREFIX}mandoc -Thtml -Oman=../html%S/%N.html -Ostyle=../style.css
+TOOL_MANDOC_HTML= ${TOOLDIR}/bin/${_TOOL_PREFIX}mandoc -Thtml
TOOL_MANDOC_LINT= ${TOOLDIR}/bin/${_TOOL_PREFIX}mandoc -Tlint
TOOL_MDSETIMAGE= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-mdsetimage
TOOL_MENUC= MENUDEF=${TOOLDIR}/share/misc ${TOOLDIR}/bin/${_TOOL_PREFIX}menuc
