diff options
| author | Murray Stokely <murray@FreeBSD.org> | 2001-11-05 10:33:38 +0000 |
|---|---|---|
| committer | Murray Stokely <murray@FreeBSD.org> | 2001-11-05 10:33:38 +0000 |
| commit | 4ffcb3417b3e83d3f69825515aa2e272cf38f774 (patch) | |
| tree | e46afb7ab0c31cbadfa3c3cee25a3fcecddbde3f /share/mk/doc.docbook.mk | |
| parent | 32918c67aaba5e882998db23cfc7f2cb09a2c3de (diff) | |
| download | doc-4ffcb3417b3e83d3f69825515aa2e272cf38f774.tar.gz doc-4ffcb3417b3e83d3f69825515aa2e272cf38f774.zip | |
Make the TIDYFLAGS/TIDYOPTS usage homologous to the rest of the make
variables in the doc infrastructure. Fixes several small bugs.
PR: docs/31703
Submitted by: Akio Morita <amorita@FreeBSD.org>
Notes
Notes:
svn path=/head/; revision=11134
Diffstat (limited to 'share/mk/doc.docbook.mk')
| -rw-r--r-- | share/mk/doc.docbook.mk | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/share/mk/doc.docbook.mk b/share/mk/doc.docbook.mk index dd5b69d855..1117c206d3 100644 --- a/share/mk/doc.docbook.mk +++ b/share/mk/doc.docbook.mk @@ -174,14 +174,14 @@ XARGS?= /usr/bin/xargs TEX?= ${PREFIX}/bin/tex PDFTEX?= ${PREFIX}/bin/pdftex TIDY?= ${PREFIX}/bin/tidy -TIDYFLAGS?= -i -m -f /dev/null +TIDYOPTS?= -i -m -f /dev/null ${TYDYFLAGS} HTML2TXT?= ${PREFIX}/bin/links -HTML2TXTFLAGS?= -dump +HTML2TXTOPTS?= -dump ${HTML2TXTFLAGS} HTML2PDB?= ${PREFIX}/bin/iSiloBSD -HTML2PDBFLAGS?= -y -d0 -Idef +HTML2PDBOPTS?= -y -d0 -Idef ${HTML2PDBFLAGS} DVIPS?= ${PREFIX}/bin/dvips .if defined(PAPERSIZE) -DVIPSFLAGS?= -t ${PAPERSIZE:L} +DVIPSOPTS?= -t ${PAPERSIZE:L} ${DVIPSFLAGS} .endif GZIP?= -9 @@ -342,7 +342,7 @@ index.html HTML.manifest: ${SRCS} ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} \ ${JADE} -V html-manifest ${HTMLOPTS} -ioutput.html.images \ ${JADEOPTS} -t sgml ${MASTERDOC} .if !defined(NO_TIDY) - -${TIDY} ${TIDYFLAGS} $$(${XARGS} < HTML.manifest) + -${TIDY} ${TIDYOPTS} $$(${XARGS} < HTML.manifest) .endif ${DOC}.html: ${SRCS} ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} \ @@ -351,7 +351,7 @@ ${DOC}.html: ${SRCS} ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} \ ${JADEOPTS} -t sgml ${MASTERDOC} > ${.TARGET} || \ (${RM} -f ${.TARGET} && false) .if !defined(NO_TIDY) - -${TIDY} ${TIDYFLAGS} ${.TARGET} + -${TIDY} ${TIDYOPTS} ${.TARGET} .endif # Special target to produce HTML with no images in it. @@ -371,10 +371,10 @@ ${DOC}.html.tar: ${DOC}.html ${LOCAL_IMAGES_LIB} \ ${LOCAL_IMAGES_LIB} ${IMAGES_PNG} ${CSS_SHEET:T} ${DOC}.txt: ${DOC}.html-text - ${HTML2TXT} ${HTML2TXTFLAGS} ${.ALLSRC} > ${.TARGET} + ${HTML2TXT} ${HTML2TXTOPTS} ${.ALLSRC} > ${.TARGET} ${DOC}.pdb: ${DOC}.html ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} - ${HTML2PDB} ${HTML2PDBFLAGS} ${DOC}.html ${.TARGET} + ${HTML2PDB} ${HTML2PDBOPTS} ${DOC}.html ${.TARGET} ${.CURDIR:T}.pdb: ${DOC}.pdb ${LN} -f ${.ALLSRC} ${.TARGET} @@ -426,7 +426,7 @@ ${DOC}.pdf: ${DOC}.tex-pdf ${IMAGES_PDF} ${PDFTEX} "&pdfjadetex" '\nonstopmode\input{${DOC}.tex-pdf}' ${DOC}.ps: ${DOC}.dvi - ${DVIPS} -o ${.TARGET} ${.ALLSRC} + ${DVIPS} ${DVIPSOPTS} -o ${.TARGET} ${.ALLSRC} ${DOC}.tar: ${SRCS} ${LOCAL_IMAGES} ${LOCAL_CSS_SHEET} ${TAR} cf ${.TARGET} -C ${.CURDIR} ${SRCS} \ |