Tue Mar 8 12:20:17 2011 UTC ()
Adjust html link template and css location for man pages in arch
subdirs.


(njoly)
diff -r1.106 -r1.107 src/share/mk/bsd.man.mk
diff -r1.652 -r1.653 src/share/mk/bsd.own.mk
cvs diff -r1.106 -r1.107 src/share/mk/bsd.man.mk (expand / switch to unified diff)

--- src/share/mk/bsd.man.mk 2011/01/12 23:03:24 1.106
+++ src/share/mk/bsd.man.mk 2011/03/08 12:20:17 1.107
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.man.mk,v 1.106 2011/01/12 23:03:24 joerg Exp $ 1# $NetBSD: bsd.man.mk,v 1.107 2011/03/08 12:20:17 njoly Exp $
2# @(#)bsd.man.mk 8.1 (Berkeley) 6/8/93 2# @(#)bsd.man.mk 8.1 (Berkeley) 6/8/93
3 3
4.include <bsd.init.mk> 4.include <bsd.init.mk>
5 5
6##### Basic targets 6##### Basic targets
7.PHONY: catinstall maninstall catpages manpages catlinks manlinks 7.PHONY: catinstall maninstall catpages manpages catlinks manlinks
8.PHONY: htmlinstall htmlpages htmllinks 8.PHONY: htmlinstall htmlpages htmllinks
9.PHONY: lintmanpages 9.PHONY: lintmanpages
10realinstall: ${MANINSTALL} 10realinstall: ${MANINSTALL}
11 11
12##### Default values 12##### Default values
13.if ${USETOOLS} == "yes" 13.if ${USETOOLS} == "yes"
14TMACDEPDIR?= ${TOOLDIR}/share/groff/tmac 14TMACDEPDIR?= ${TOOLDIR}/share/groff/tmac
@@ -179,33 +179,37 @@ ${_t}: ${_l} __linkinstallpage @@ -179,33 +179,37 @@ ${_t}: ${_l} __linkinstallpage
179 179
180catlinks:: ${_t} 180catlinks:: ${_t}
181.PRECIOUS: ${_t} 181.PRECIOUS: ${_t}
182.endfor 182.endfor
183.endif # (${MKCATPAGES} != "no") && (${MKMAN} != "no") 183.endif # (${MKCATPAGES} != "no") && (${MKMAN} != "no")
184 184
185##### Build and install rules (HTML pages) 185##### Build and install rules (HTML pages)
186 186
187.if (${MKHTML} != "no") && (${MKMAN} != "no") # { 187.if (${MKHTML} != "no") && (${MKMAN} != "no") # {
188htmlinstall: htmlpages htmllinks 188htmlinstall: htmlpages htmllinks
189htmlpages:: # ensure target exists 189htmlpages:: # ensure target exists
190HTMLPAGES= ${MAN:C/\.([1-9])$/.html\1/} 190HTMLPAGES= ${MAN:C/\.([1-9])$/.html\1/}
191 191
 192HTMLLINKS= ${MANSUBDIR:?../:}../html%S/%N.html
 193HTMLSTYLE= ${MANSUBDIR:?../:}../style.css
 194
192realall: ${HTMLPAGES} 195realall: ${HTMLPAGES}
193.NOPATH: ${HTMLPAGES} 196.NOPATH: ${HTMLPAGES}
194.SUFFIXES: ${_MNUMBERS:@N@.html$N@} 197.SUFFIXES: ${_MNUMBERS:@N@.html$N@}
195 198
196${_MNUMBERS:@N@.$N.html$N@}: # build rule 199${_MNUMBERS:@N@.$N.html$N@}: # build rule
197 ${_MKTARGET_FORMAT} 200 ${_MKTARGET_FORMAT}
198 ${TOOL_MANDOC_HTML} ${.IMPSRC} > ${.TARGET}.tmp && \ 201 ${TOOL_MANDOC_HTML} -Oman=${HTMLLINKS} -Ostyle=${HTMLSTYLE} \
 202 ${.IMPSRC} > ${.TARGET}.tmp && \
199 mv ${.TARGET}.tmp ${.TARGET} 203 mv ${.TARGET}.tmp ${.TARGET}
200 204
201.for F in ${HTMLPAGES:O:u} 205.for F in ${HTMLPAGES:O:u}
202# construct installed path 206# construct installed path
203_F:= ${HTMLDIR}/${F:T:E}${MANSUBDIR}/${F:R:S-/index$-/x&-}.html 207_F:= ${HTMLDIR}/${F:T:E}${MANSUBDIR}/${F:R:S-/index$-/x&-}.html
204 208
205.if ${MKUPDATE} == "no" 209.if ${MKUPDATE} == "no"
206${_F}! ${F} __installpage # install rule 210${_F}! ${F} __installpage # install rule
207.if !defined(BUILD) && !make(all) && !make(${F}) 211.if !defined(BUILD) && !make(all) && !make(${F})
208${_F}! .MADE # no build at install 212${_F}! .MADE # no build at install
209.endif 213.endif
210.else 214.else
211${_F}: ${F} __installpage # install rule 215${_F}: ${F} __installpage # install rule
cvs diff -r1.652 -r1.653 src/share/mk/bsd.own.mk (expand / switch to unified diff)

--- src/share/mk/bsd.own.mk 2011/02/07 21:23:47 1.652
+++ src/share/mk/bsd.own.mk 2011/03/08 12:20:17 1.653
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.own.mk,v 1.652 2011/02/07 21:23:47 mrg Exp $ 1# $NetBSD: bsd.own.mk,v 1.653 2011/03/08 12:20:17 njoly Exp $
2 2
3# This needs to be before bsd.init.mk 3# This needs to be before bsd.init.mk
4.if defined(BSD_MK_COMPAT_FILE) 4.if defined(BSD_MK_COMPAT_FILE)
5.include <${BSD_MK_COMPAT_FILE}> 5.include <${BSD_MK_COMPAT_FILE}>
6.endif 6.endif
7 7
8.if !defined(_BSD_OWN_MK_) 8.if !defined(_BSD_OWN_MK_)
9_BSD_OWN_MK_=1 9_BSD_OWN_MK_=1
10 10
11MAKECONF?= /etc/mk.conf 11MAKECONF?= /etc/mk.conf
12.-include "${MAKECONF}" 12.-include "${MAKECONF}"
13 13
14# 14#
@@ -258,27 +258,27 @@ TOOL_GROFF= PATH=${TOOLDIR}/lib/groff:$ @@ -258,27 +258,27 @@ TOOL_GROFF= PATH=${TOOLDIR}/lib/groff:$
258TOOL_HEXDUMP= ${TOOLDIR}/bin/${_TOOL_PREFIX}hexdump 258TOOL_HEXDUMP= ${TOOLDIR}/bin/${_TOOL_PREFIX}hexdump
259TOOL_HP300MKBOOT= ${TOOLDIR}/bin/${_TOOL_PREFIX}hp300-mkboot 259TOOL_HP300MKBOOT= ${TOOLDIR}/bin/${_TOOL_PREFIX}hp300-mkboot
260TOOL_HP700MKBOOT= ${TOOLDIR}/bin/${_TOOL_PREFIX}hp700-mkboot 260TOOL_HP700MKBOOT= ${TOOLDIR}/bin/${_TOOL_PREFIX}hp700-mkboot
261TOOL_INDXBIB= ${TOOLDIR}/bin/${_TOOL_PREFIX}indxbib 261TOOL_INDXBIB= ${TOOLDIR}/bin/${_TOOL_PREFIX}indxbib
262TOOL_INSTALLBOOT= ${TOOLDIR}/bin/${_TOOL_PREFIX}installboot 262TOOL_INSTALLBOOT= ${TOOLDIR}/bin/${_TOOL_PREFIX}installboot
263TOOL_INSTALL_INFO= ${TOOLDIR}/bin/${_TOOL_PREFIX}install-info 263TOOL_INSTALL_INFO= ${TOOLDIR}/bin/${_TOOL_PREFIX}install-info
264TOOL_JOIN= ${TOOLDIR}/bin/${_TOOL_PREFIX}join 264TOOL_JOIN= ${TOOLDIR}/bin/${_TOOL_PREFIX}join
265TOOL_M4= ${TOOLDIR}/bin/${_TOOL_PREFIX}m4 265TOOL_M4= ${TOOLDIR}/bin/${_TOOL_PREFIX}m4
266TOOL_MACPPCFIXCOFF= ${TOOLDIR}/bin/${_TOOL_PREFIX}macppc-fixcoff 266TOOL_MACPPCFIXCOFF= ${TOOLDIR}/bin/${_TOOL_PREFIX}macppc-fixcoff
267TOOL_MAKEFS= ${TOOLDIR}/bin/${_TOOL_PREFIX}makefs 267TOOL_MAKEFS= ${TOOLDIR}/bin/${_TOOL_PREFIX}makefs
268TOOL_MAKEINFO= ${TOOLDIR}/bin/${_TOOL_PREFIX}makeinfo 268TOOL_MAKEINFO= ${TOOLDIR}/bin/${_TOOL_PREFIX}makeinfo
269TOOL_MAKEWHATIS= ${TOOLDIR}/bin/${_TOOL_PREFIX}makewhatis 269TOOL_MAKEWHATIS= ${TOOLDIR}/bin/${_TOOL_PREFIX}makewhatis
270TOOL_MANDOC_ASCII= ${TOOLDIR}/bin/${_TOOL_PREFIX}mandoc -Tascii 270TOOL_MANDOC_ASCII= ${TOOLDIR}/bin/${_TOOL_PREFIX}mandoc -Tascii
271TOOL_MANDOC_HTML= ${TOOLDIR}/bin/${_TOOL_PREFIX}mandoc -Thtml -Oman=../html%S/%N.html -Ostyle=../style.css 271TOOL_MANDOC_HTML= ${TOOLDIR}/bin/${_TOOL_PREFIX}mandoc -Thtml
272TOOL_MANDOC_LINT= ${TOOLDIR}/bin/${_TOOL_PREFIX}mandoc -Tlint 272TOOL_MANDOC_LINT= ${TOOLDIR}/bin/${_TOOL_PREFIX}mandoc -Tlint
273TOOL_MDSETIMAGE= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-mdsetimage 273TOOL_MDSETIMAGE= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-mdsetimage
274TOOL_MENUC= MENUDEF=${TOOLDIR}/share/misc ${TOOLDIR}/bin/${_TOOL_PREFIX}menuc 274TOOL_MENUC= MENUDEF=${TOOLDIR}/share/misc ${TOOLDIR}/bin/${_TOOL_PREFIX}menuc
275TOOL_MIPSELF2ECOFF= ${TOOLDIR}/bin/${_TOOL_PREFIX}mips-elf2ecoff 275TOOL_MIPSELF2ECOFF= ${TOOLDIR}/bin/${_TOOL_PREFIX}mips-elf2ecoff
276TOOL_MKCSMAPPER= ${TOOLDIR}/bin/${_TOOL_PREFIX}mkcsmapper 276TOOL_MKCSMAPPER= ${TOOLDIR}/bin/${_TOOL_PREFIX}mkcsmapper
277TOOL_MKESDB= ${TOOLDIR}/bin/${_TOOL_PREFIX}mkesdb 277TOOL_MKESDB= ${TOOLDIR}/bin/${_TOOL_PREFIX}mkesdb
278TOOL_MKLOCALE= ${TOOLDIR}/bin/${_TOOL_PREFIX}mklocale 278TOOL_MKLOCALE= ${TOOLDIR}/bin/${_TOOL_PREFIX}mklocale
279TOOL_MKMAGIC= ${TOOLDIR}/bin/${_TOOL_PREFIX}file 279TOOL_MKMAGIC= ${TOOLDIR}/bin/${_TOOL_PREFIX}file
280TOOL_MKTEMP= ${TOOLDIR}/bin/${_TOOL_PREFIX}mktemp 280TOOL_MKTEMP= ${TOOLDIR}/bin/${_TOOL_PREFIX}mktemp
281TOOL_MKUBOOTIMAGE= ${TOOLDIR}/bin/${_TOOL_PREFIX}mkubootimage 281TOOL_MKUBOOTIMAGE= ${TOOLDIR}/bin/${_TOOL_PREFIX}mkubootimage
282TOOL_MSGC= MSGDEF=${TOOLDIR}/share/misc ${TOOLDIR}/bin/${_TOOL_PREFIX}msgc 282TOOL_MSGC= MSGDEF=${TOOLDIR}/share/misc ${TOOLDIR}/bin/${_TOOL_PREFIX}msgc
283TOOL_MTREE= ${TOOLDIR}/bin/${_TOOL_PREFIX}mtree 283TOOL_MTREE= ${TOOLDIR}/bin/${_TOOL_PREFIX}mtree
284TOOL_NBPERF= ${TOOLDIR}/bin/${_TOOL_PREFIX}nbperf 284TOOL_NBPERF= ${TOOLDIR}/bin/${_TOOL_PREFIX}nbperf