os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Use FOO_CMD instead of FOO to avoid a conflict with a variable used

Browse source 
in the docproj port.  TEX, LATEX, PDFTEX, JADETEX, and PDFJADETEX
has been renamed to TEX_CMD, LATEX_CMD, PDFTEX_CMD, JADETEX_CMD, and
PDFJADETEX_CMD for consistency.  And TEXCMDS has been renamed
TEX_CMDSEQ because TEXCMDS and TEX_CMD are misleading names.

Discussed on:	-doc
This commit is contained in:
Hiroki Sato 2004-02-16 14:13:24 +00:00
parent e41ce179c4
commit ed2b02d9be
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=20037
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
share/mk/doc.docbook.mk
View file

@ -183,12 +183,12 @@ JUSTIFY=1
#GEN_INDEX=1 #GEN_INDEX=1
.endif .endif
.if defined(JUSTIFY) .if defined(JUSTIFY)
TEXCMDS+= \RequirePackage{url} TEX_CMDSEQ+= \RequirePackage{url}
PRINTOPTS+= -ioutput.print.justify PRINTOPTS+= -ioutput.print.justify
.endif .endif
.if defined(TWO_SIDE) .if defined(TWO_SIDE)
PRINTOPTS+= -V %two-side% -ioutput.print.twoside PRINTOPTS+= -V %two-side% -ioutput.print.twoside
TEXCMDS+= \def\PageTwoSide{1} TEX_CMDSEQ+= \def\PageTwoSide{1}
.endif .endif
.if defined(NICE_HEADERS) .if defined(NICE_HEADERS)
PRINTOPTS+= -ioutput.print.niceheaders PRINTOPTS+= -ioutput.print.niceheaders
@ -197,7 +197,7 @@ PRINTOPTS+= -ioutput.print.niceheaders
PRINTOPTS+= -V minimal-section-labels PRINTOPTS+= -V minimal-section-labels
.endif .endif
.if defined(TRACE) .if defined(TRACE)
TEXCMDS+= \tracingstats=${TRACE} TEX_CMDSEQ+= \tracingstats=${TRACE}
.endif .endif
.if defined(RLE) .if defined(RLE)
PNMTOPSFLAGS+= -rle PNMTOPSFLAGS+= -rle
@ -231,11 +231,11 @@ TAR?= /usr/bin/tar
TOUCH?= /usr/bin/touch TOUCH?= /usr/bin/touch
XARGS?= /usr/bin/xargs XARGS?= /usr/bin/xargs
TEX?= ${PREFIX}/bin/tex TEX_CMD?= ${PREFIX}/bin/tex
LATEX?= ${PREFIX}/bin/latex LATEX_CMD?= ${PREFIX}/bin/latex
PDFTEX?= ${PREFIX}/bin/pdftex PDFTEX_CMD?= ${PREFIX}/bin/pdftex
JADETEX?= ${TEX} "&jadetex" JADETEX_CMD?= ${TEX_CMD} "&jadetex"
PDFJADETEX?= ${PDFTEX} "&pdfjadetex" PDFJADETEX_CMD?=${PDFTEX_CMD} "&pdfjadetex"
GROFF?= groff GROFF?= groff
TIDY?= ${PREFIX}/bin/tidy TIDY?= ${PREFIX}/bin/tidy
TIDYOPTS?= -wrap 90 -m -raw -preserve -f /dev/null -asxml ${TIDYFLAGS} TIDYOPTS?= -wrap 90 -m -raw -preserve -f /dev/null -asxml ${TIDYFLAGS}
@ -554,11 +554,11 @@ ${DOC}.dvi: ${DOC}.tex ${LOCAL_IMAGES_EPS}
${CP} -p ${_curimage} ${.CURDIR:H:H}/${_curimage:H:S|${IMAGES_EN_DIR}/||:S|${.CURDIR}||} ${CP} -p ${_curimage} ${.CURDIR:H:H}/${_curimage:H:S|${IMAGES_EN_DIR}/||:S|${.CURDIR}||}
.endfor .endfor
@${ECHO} "==> TeX pass 1/3" @${ECHO} "==> TeX pass 1/3"
-${JADETEX} '${TEXCMDS} \nonstopmode\input{${DOC}.tex}' -${JADETEX_CMD} '${TEX_CMDSEQ} \nonstopmode\input{${DOC}.tex}'
@${ECHO} "==> TeX pass 2/3" @${ECHO} "==> TeX pass 2/3"
-${JADETEX} '${TEXCMDS} \nonstopmode\input{${DOC}.tex}' -${JADETEX_CMD} '${TEX_CMDSEQ} \nonstopmode\input{${DOC}.tex}'
@${ECHO} "==> TeX pass 3/3" @${ECHO} "==> TeX pass 3/3"
-${JADETEX} '${TEXCMDS} \nonstopmode\input{${DOC}.tex}' -${JADETEX_CMD} '${TEX_CMDSEQ} \nonstopmode\input{${DOC}.tex}'
.if !target(${DOC}.pdf) .if !target(${DOC}.pdf)
${DOC}.pdf: ${DOC}.tex-pdf ${IMAGES_PDF} ${DOC}.pdf: ${DOC}.tex-pdf ${IMAGES_PDF}
@ -566,11 +566,11 @@ ${DOC}.pdf: ${DOC}.tex-pdf ${IMAGES_PDF}
${CP} -p ${_curimage} ${.CURDIR:H:H}/${_curimage:H:S|${IMAGES_EN_DIR}/||:S|${.CURDIR}||} ${CP} -p ${_curimage} ${.CURDIR:H:H}/${_curimage:H:S|${IMAGES_EN_DIR}/||:S|${.CURDIR}||}
.endfor .endfor
@${ECHO} "==> PDFTeX pass 1/3" @${ECHO} "==> PDFTeX pass 1/3"
-${PDFJADETEX} '${TEXCMDS} \nonstopmode\input{${DOC}.tex-pdf}' -${PDFJADETEX_CMD} '${TEX_CMDSEQ} \nonstopmode\input{${DOC}.tex-pdf}'
@${ECHO} "==> PDFTeX pass 2/3" @${ECHO} "==> PDFTeX pass 2/3"
-${PDFJADETEX} '${TEXCMDS} \nonstopmode\input{${DOC}.tex-pdf}' -${PDFJADETEX_CMD} '${TEX_CMDSEQ} \nonstopmode\input{${DOC}.tex-pdf}'
@${ECHO} "==> PDFTeX pass 3/3" @${ECHO} "==> PDFTeX pass 3/3"
${PDFJADETEX} '${TEXCMDS} \nonstopmode\input{${DOC}.tex-pdf}' ${PDFJADETEX_CMD} '${TEX_CMDSEQ} \nonstopmode\input{${DOC}.tex-pdf}'
.endif .endif
${DOC}.ps: ${DOC}.dvi ${DOC}.ps: ${DOC}.dvi