Add definitions required for using SAXON instead of libxslt when

USE_SAXON is set.  This doesn't quite work yet.

Also fix a bug in the .fo target that was uncovered when slides for a
presentation are split across multiple XML files.
This commit is contained in:
Murray Stokely 2004-09-07 11:56:03 +00:00
parent d15994f1fb
commit c290cc6eff
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/head/; revision=22262
2 changed files with 8 additions and 2 deletions

View file

@ -100,6 +100,8 @@ JADETEX_CMD?= ${TEX_CMD} "&jadetex"
PDFJADETEX_CMD?=${PDFTEX_CMD} "&pdfjadetex"
FOP_CMD?= ${PREFIX}/share/fop/fop.sh
XEP_CMD?= sh ${HOME}/XEP/xep.sh
JAVA_CMD?= ${PREFIX}/bin/javavm
SAXON_CMD?= ${JAVA_CMD} -jar ${PREFIX}/share/java/classes/saxon.jar
# Image processing (contains code used by the doc.<format>.mk files, so must
# be listed first).

View file

@ -53,7 +53,7 @@ CLEANFILES+= ${DOC}.aux ${DOC}.log ${DOC}.out texput.log
.endfor
XSLTPROCFLAGS?= --nonet
XSLTPROCFLAGS?= --nonet --stringparam draft.mode no
XSLTPROCOPTS= ${XSLTPROCFLAGS}
.MAIN: all
@ -64,7 +64,11 @@ ${DOC}.html: ${SRCS}
${XSLTPROC} ${XSLTPROCOPTS} ${SLIDES_XSLHTML} ${.ALLSRC}
${DOC}.fo: ${SRCS}
${XSLTPROC} ${XSLTPROCOPTS} ${SLIDES_XSLPRINT} ${.ALLSRC} > ${.TARGET:S/.pdf$/.fo/}
.if defined(USE_SAXON)
${SAXON_CMD} ${DOC}.xml ${SLIDES_XSLPRINT} > ${.TARGET:S/.pdf$/.fo/}
.else
${XSLTPROC} ${XSLTPROCOPTS} ${SLIDES_XSLPRINT} ${DOC}.xml > ${.TARGET:S/.pdf$/.fo/}
.endif
${DOC}.pdf: ${DOC}.fo
.if defined(USE_FOP)