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

Quiet a few make warnings by adding a few .if statements.

Browse source 
bsd.obj.mk already includes bsd.subdir.mk so there is no need
to include it twice.

PR:		52540
Submitted by:	"Simon L.Nielsen" <simon@nitro.dk>
Tested with:	cd doc/ && make
This commit is contained in:
Tom Rhodes 2003-05-21 21:16:10 +00:00
parent 0d9416c284
commit 3d8fe4fa43
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=17054
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -512,12 +512,14 @@ ${DOC}.tex: ${SRCS} ${LOCAL_IMAGES_EPS} ${INDEX_SGML} ${PRINT_INDEX} \
${DOC}.tex-ps: ${DOC}.tex
${LN} -f ${.ALLSRC} ${.TARGET}
.if !target(${DOC}.tex-pdf)
${DOC}.tex-pdf: ${SRCS} ${IMAGES_PDF} ${INDEX_SGML} ${PRINT_INDEX} \
${LOCAL_IMAGES_TXT}
${RM} -f ${.TARGET}
${CAT} ${PDFTEX_DEF} > ${.TARGET}
${JADE} -V tex-backend ${PRINTOPTS} -ioutput.print.pdf \
${JADEOPTS} -t tex -o /dev/stdout ${MASTERDOC} >> ${.TARGET}
.endif
${DOC}.dvi: ${DOC}.tex ${LOCAL_IMAGES_EPS}
.for _curimage in ${LOCAL_IMAGES_EPS:M*share*}
@ -530,6 +532,7 @@ ${DOC}.dvi: ${DOC}.tex ${LOCAL_IMAGES_EPS}
@${ECHO} "==> TeX pass 3/3"
-${TEX} "&jadetex" '${TEXCMDS} \nonstopmode\input{${DOC}.tex}'
.if !target(${DOC}.pdf)
${DOC}.pdf: ${DOC}.tex-pdf ${IMAGES_PDF}
.for _curimage in ${IMAGES_PDF:M*share*}
${CP} -p ${_curimage} ${.CURDIR:H:H}/${_curimage:H:S|${IMAGES_EN_DIR}/||:S|${.CURDIR}||}
@ -540,6 +543,7 @@ ${DOC}.pdf: ${DOC}.tex-pdf ${IMAGES_PDF}
-${PDFTEX} "&pdfjadetex" '${TEXCMDS} \nonstopmode\input{${DOC}.tex-pdf}'
@${ECHO} "==> PDFTeX pass 3/3"
${PDFTEX} "&pdfjadetex" '${TEXCMDS} \nonstopmode\input{${DOC}.tex-pdf}'
.endif
${DOC}.ps: ${DOC}.dvi
${DVIPS} ${DVIPSOPTS} -o ${.TARGET} ${.ALLSRC}
@ -794,6 +798,7 @@ install-${_curformat}.tar.${_compressext}: ${DOC}.${_curformat}.tar.${_compresse
.endfor
.else
.for _compressext in ${KNOWN_COMPRESS}
.if !target(install-${_curformat}.${_compressext})
install-${_curformat}.${_compressext}: ${DOC}.${_curformat}.${_compressext}
@[ -d ${DESTDIR} ] || ${MKDIR} -p ${DESTDIR}
${INSTALL_DOCS} ${.ALLSRC} ${DESTDIR}
@ -801,6 +806,7 @@ install-${_curformat}.${_compressext}: ${DOC}.${_curformat}.${_compressext}
${LN} -f ${DESTDIR}/${.ALLSRC} \
${DESTDIR}/${.CURDIR:T}.${_curformat}.${_compressext}
.endif
.endif
.endfor
.endif
.endif

1
share/mk/doc.subdir.mk
View file

@ -121,7 +121,6 @@ _SUBDIRUSE: .USE
.if !defined(NOINCLUDEMK)
.include <bsd.obj.mk>
.include <bsd.subdir.mk>
.else