Attachment #17235 for bug #31350

View | Details | Raw Unified | Return to bug 31350
Collapse All | Expand All

Lines 126-131 Link Here

(-)share/mk/doc.docbook.mk (-4 / +6 lines)
126	KNOWN_FORMATS= html html.tar html-split html-split.tar txt rtf ps pdf tex dvi tar pdb	126	KNOWN_FORMATS= html html.tar html-split html-split.tar txt rtf ps pdf tex dvi tar pdb
127		127
128	CSS_SHEET?= ${DOC_PREFIX}/share/misc/docbook.css	128	CSS_SHEET?= ${DOC_PREFIX}/share/misc/docbook.css
		129	CSS_SHEET:= ${.CURDIR}/${CSS_SHEET}
		130	CSS_SHEET:= ${CSS_SHEET:C/.*\/\//\//g}
129		131
130	PRINTOPTS?= -ioutput.print	132	PRINTOPTS?= -ioutput.print
131		133
Lines 298-304 Link Here
298	all: ${_docs}	300	all: ${_docs}
299		301
300	index.html HTML.manifest: ${SRCS} ${LOCAL_IMAGES_LIB} ${IMAGES_PNG} ${INDEX_SGML} ${HTML_SPLIT_INDEX} docbook.css	302	index.html HTML.manifest: ${SRCS} ${LOCAL_IMAGES_LIB} ${IMAGES_PNG} ${INDEX_SGML} ${HTML_SPLIT_INDEX} docbook.css
301	${JADE} -V html-manifest -ioutput.html -ioutput.html.images ${JADEOPTS} -d ${DSLHTML} -t sgml ${MASTERDOC}	303	${JADE} -D`dirname ${.TARGET}` -V html-manifest -ioutput.html -ioutput.html.images ${JADEOPTS} -d ${DSLHTML} -t sgml ${MASTERDOC}
302	.if !defined(NO_TIDY)	304	.if !defined(NO_TIDY)
303	-tidy -i -m -f /dev/null ${TIDYFLAGS} `xargs < HTML.manifest`	305	-tidy -i -m -f /dev/null ${TIDYFLAGS} `xargs < HTML.manifest`
304	.endif	306	.endif
Lines 407-417 Link Here
407	.endif	409	.endif
408		410
409	${HTML_INDEX}:	411	${HTML_INDEX}:
410	${JADE} -V html-index -ioutput.html -ioutput.html.images -V nochunks ${JADEOPTS} -d ${DSLHTML} -t sgml ${MASTERDOC} > /dev/null	412	${JADE} -D`dirname ${.TARGET}` -V html-index -ioutput.html -ioutput.html.images -V nochunks ${JADEOPTS} -d ${DSLHTML} -t sgml ${MASTERDOC} > /dev/null
411	perl ${PREFIX}/share/sgml/docbook/dsssl/modular/bin/collateindex.pl -g -o ${INDEX_SGML} ${.TARGET}	413	perl ${PREFIX}/share/sgml/docbook/dsssl/modular/bin/collateindex.pl -g -o ${INDEX_SGML} ${.TARGET}
412		414
413	${HTML_SPLIT_INDEX}:	415	${HTML_SPLIT_INDEX}:
414	${JADE} -V html-index -ioutput.html -ioutput.html.images ${JADEOPTS} -d ${DSLHTML} -t sgml ${MASTERDOC} > /dev/null	416	${JADE} -D`dirname ${.TARGET}` -V html-index -ioutput.html -ioutput.html.images ${JADEOPTS} -d ${DSLHTML} -t sgml ${MASTERDOC} > /dev/null
415	perl ${PREFIX}/share/sgml/docbook/dsssl/modular/bin/collateindex.pl -g -o ${INDEX_SGML} ${.TARGET}	417	perl ${PREFIX}/share/sgml/docbook/dsssl/modular/bin/collateindex.pl -g -o ${INDEX_SGML} ${.TARGET}
416		418
417	${PRINT_INDEX}: ${HTML_INDEX}	419	${PRINT_INDEX}: ${HTML_INDEX}
Lines 613-616 Link Here
613	.endfor	615	.endfor
614		616
615	docbook.css: ${CSS_SHEET}	617	docbook.css: ${CSS_SHEET}
616	cp ${CSS_SHEET} ${.CURDIR}/docbook.css	618	cp ${CSS_SHEET} ${.TARGET}

Lines 116-122 Link Here

(-)share/mk/doc.html.mk (-2 / +2 lines)
116	all: ${_docs}	116	all: ${_docs}
117		117
118	${DOC}.html: ${SRCS} ${LOCAL_IMAGES_LIB} ${IMAGES_PNG}	118	${DOC}.html: ${SRCS} ${LOCAL_IMAGES_LIB} ${IMAGES_PNG}
119	${SGMLNORM} -c ${HTMLCATALOG} ${SRCS} > ${.TARGET}	119	${SGMLNORM} -c ${HTMLCATALOG} ${MASTERDOC} > ${.TARGET}
120	.if !defined(NO_TIDY)	120	.if !defined(NO_TIDY)
121	-tidy -i -m -f /dev/null ${TIDYFLAGS} ${.TARGET}	121	-tidy -i -m -f /dev/null ${TIDYFLAGS} ${.TARGET}
122	.endif	122	.endif
Lines 236-242 Link Here
236	install-${_cf}: ${DOC}.${_cf}	236	install-${_cf}: ${DOC}.${_cf}
237	@[ -d ${DESTDIR} ] \|\| mkdir -p ${DESTDIR}	237	@[ -d ${DESTDIR} ] \|\| mkdir -p ${DESTDIR}
238	${INSTALL_DOCS} ${.ALLSRC} ${DESTDIR}	238	${INSTALL_DOCS} ${.ALLSRC} ${DESTDIR}
239	${INSTALL_DOCS} ${CSS_SHEET} ${DESTDIR}	239	${INSTALL_DOCS} ${.CURDIR}/${CSS_SHEET} ${DESTDIR}
240	.for _curimage in ${IMAGES_LIB}	240	.for _curimage in ${IMAGES_LIB}
241	@[ -d ${DESTDIR}/${LOCAL_IMAGES_LIB_DIR}/${_curimage:H} ] \|\| mkdir -p ${DESTDIR}/${LOCAL_IMAGES_LIB_DIR}/${_curimage:H}	241	@[ -d ${DESTDIR}/${LOCAL_IMAGES_LIB_DIR}/${_curimage:H} ] \|\| mkdir -p ${DESTDIR}/${LOCAL_IMAGES_LIB_DIR}/${_curimage:H}
242	${INSTALL_DOCS} ${LOCAL_IMAGES_LIB_DIR}/${_curimage} ${DESTDIR}/${LOCAL_IMAGES_LIB_DIR}/${_curimage:H}	242	${INSTALL_DOCS} ${LOCAL_IMAGES_LIB_DIR}/${_curimage} ${DESTDIR}/${LOCAL_IMAGES_LIB_DIR}/${_curimage:H}

Lines 51-57 Link Here

(-)share/mk/doc.images.mk (-1 / +18 lines)
51	IMAGES_GEN_EPS=${IMAGES:M*.png:S/.png$/.eps/}	51	IMAGES_GEN_EPS=${IMAGES:M*.png:S/.png$/.eps/}
52	IMAGES_GEN_PDF=${IMAGES:M*.eps:S/.eps$/.pdf/}	52	IMAGES_GEN_PDF=${IMAGES:M*.eps:S/.eps$/.pdf/}
53		53
54	CLEANFILES+= ${IMAGES_GEN_PNG} ${IMAGES_GEN_EPS} ${IMAGES_GEN_PDF}	54	CLEANFILES+= ${IMAGES_GEN_PNG} ${IMAGES_GEN_EPS} ${IMAGES_GEN_PDF} \
		55	${IMAGES:M.scr:S/.scr$/.png/} ${IMAGES:M.scr:S/.scr$/.eps/}
		56	.if ${.CURDIR}!=${.OBJDIR}
		57	CLEANFILES+= ${IMAGES:M.png} ${IMAGES:M.eps}
		58	.endif
55		59
56	IMAGES_PNG=${IMAGES:M.png} ${IMAGES_GEN_PNG} ${IMAGES:M.scr:S/.scr$/.png/}	60	IMAGES_PNG=${IMAGES:M.png} ${IMAGES_GEN_PNG} ${IMAGES:M.scr:S/.scr$/.png/}
57	IMAGES_EPS=${IMAGES:M.eps} ${IMAGES_GEN_EPS} ${IMAGES:M.scr:S/.scr$/.eps/}	61	IMAGES_EPS=${IMAGES:M.eps} ${IMAGES_GEN_EPS} ${IMAGES:M.scr:S/.scr$/.eps/}
Lines 71-78 Link Here
71	.SUFFIXES: .scr .png .eps	75	.SUFFIXES: .scr .png .eps
72		76
73	.scr.png:	77	.scr.png:
		78	@mkdir -p `dirname ${.TARGET}`
74	scr2png < ${.IMPSRC} > ${.TARGET}	79	scr2png < ${.IMPSRC} > ${.TARGET}
75	.scr.eps:	80	.scr.eps:
		81	@mkdir -p `dirname ${.TARGET}`
76	scr2png < ${.ALLSRC} \| pngtopnm \| pnmtops -noturn > ${.TARGET}	82	scr2png < ${.ALLSRC} \| pngtopnm \| pnmtops -noturn > ${.TARGET}
77		83
78	# We can't use suffix rules to generate the rules to convert EPS to PNG and	84	# We can't use suffix rules to generate the rules to convert EPS to PNG and
Lines 80-97 Link Here
80	# vice versa, leading to a loop in the dependency graph. Instead, build	86	# vice versa, leading to a loop in the dependency graph. Instead, build
81	# the targets on the fly.	87	# the targets on the fly.
82		88
		89	.for _curimage in ${IMAGES:M.png} ${IMAGES:M.eps}
		90	.if ${.CURDIR}!=${.OBJDIR}
		91	${_curimage}: ${.CURDIR}/${_curimage}
		92	@mkdir -p `dirname ${.TARGET}`
		93	cp ${.ALLSRC} ${.TARGET}
		94	.endif
		95	.endfor
		96
83	.for _curimage in ${IMAGES_GEN_PNG}	97	.for _curimage in ${IMAGES_GEN_PNG}
84	${_curimage}: ${_curimage:S/.png$/.eps/}	98	${_curimage}: ${_curimage:S/.png$/.eps/}
		99	@mkdir -p `dirname ${.TARGET}`
85	peps -r ${EPS2PNG_RES} -p -o ${.TARGET} ${.ALLSRC}	100	peps -r ${EPS2PNG_RES} -p -o ${.TARGET} ${.ALLSRC}
86	.endfor	101	.endfor
87		102
88	.for _curimage in ${IMAGES_GEN_EPS}	103	.for _curimage in ${IMAGES_GEN_EPS}
89	${_curimage}: ${_curimage:S/.eps$/.png/}	104	${_curimage}: ${_curimage:S/.eps$/.png/}
		105	@mkdir -p `dirname ${.TARGET}`
90	pngtopnm ${.ALLSRC} \| pnmtops -noturn > ${.TARGET}	106	pngtopnm ${.ALLSRC} \| pnmtops -noturn > ${.TARGET}
91	.endfor	107	.endfor
92		108
93	.for _curimage in ${IMAGES_GEN_PDF}	109	.for _curimage in ${IMAGES_GEN_PDF}
94	${_curimage}: ${_curimage:S/.pdf$/.eps/}	110	${_curimage}: ${_curimage:S/.pdf$/.eps/}
		111	@mkdir -p `dirname ${.TARGET}`
95	epstopdf --outfile=${.TARGET} ${_curimage:S/.pdf$/.eps/}	112	epstopdf --outfile=${.TARGET} ${_curimage:S/.pdf$/.eps/}
96	.endfor	113	.endfor
97		114

Return to bug 31350