Date: Sat, 26 Mar 2005 02:44:53 +0200 From: Giorgos Keramidas <keramida@freebsd.org> To: John Baldwin <jhb@freebsd.org> Cc: doc@freebsd.org Subject: Re: docs breaking my make release Message-ID: <20050326004453.GA51118@gothmog.gr> In-Reply-To: <200503251410.00034.jhb@FreeBSD.org> References: <200503251410.00034.jhb@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 2005-03-25 14:09, John Baldwin <jhb@freebsd.org> wrote: > I'm trying to build a release with docs for some more ISO layout > tweaks, but the doc build keeps failing. Any ideas? > > ===> en_US.ISO8859-1/articles/checkpoint (all) > Unclosed substitution for @ (/ missing) > *** Error code 2 The IMAGE_EN substitutions done in doc/share/mk/ are broken. It seems our make has changed its behavior and now expects '$' characters to be doubled in expressions like this: FOO= ${BAR:S/.eps$/.png} Replacing all the patterns matched in doc/share/mk/*.mk with the following patch fixes the doc build again. I'm not sure if the change in the behavior of make is a bug or if it intentional. Harti would be the right person to answer this, I guess. Regards, Giorgos %%%% patch begins here %%%% Index: doc.images.mk =================================================================== RCS file: /home/ncvs/doc/share/mk/doc.images.mk,v retrieving revision 1.29 diff -u -r1.29 doc.images.mk --- doc.images.mk 23 Jul 2004 18:58:56 -0000 1.29 +++ doc.images.mk 26 Mar 2005 00:36:30 -0000 @@ -71,21 +71,21 @@ _IMAGES_PIC= ${IMAGES:M*.pic} _IMAGES_PIC+= ${LOCAL_IMAGES_EN:M*.pic} -IMAGES_GEN_PNG= ${_IMAGES_EPS:S/.eps$/.png/} -IMAGES_GEN_EPS= ${_IMAGES_PNG:S/.png$/.eps/} -IMAGES_GEN_PDF= ${_IMAGES_EPS:S/.eps$/.pdf/} -IMAGES_SCR_PNG= ${_IMAGES_SCR:S/.scr$/.png/} -IMAGES_SCR_EPS= ${_IMAGES_SCR:S/.scr$/.eps/} -IMAGES_SCR_PDF= ${_IMAGES_SCR:S/.scr$/.pdf/} -IMAGES_SCR_TXT= ${_IMAGES_SCR:S/.scr$/.txt/} -IMAGES_PIC_PNG= ${_IMAGES_PIC:S/.pic$/.png/} -IMAGES_PIC_EPS= ${_IMAGES_PIC:S/.pic$/.eps/} -IMAGES_PIC_PDF= ${_IMAGES_PIC:S/.pic$/.pdf/} +IMAGES_GEN_PNG= ${_IMAGES_EPS:S/.eps$$/.png/} +IMAGES_GEN_EPS= ${_IMAGES_PNG:S/.png$$/.eps/} +IMAGES_GEN_PDF= ${_IMAGES_EPS:S/.eps$$/.pdf/} +IMAGES_SCR_PNG= ${_IMAGES_SCR:S/.scr$$/.png/} +IMAGES_SCR_EPS= ${_IMAGES_SCR:S/.scr$$/.eps/} +IMAGES_SCR_PDF= ${_IMAGES_SCR:S/.scr$$/.pdf/} +IMAGES_SCR_TXT= ${_IMAGES_SCR:S/.scr$$/.txt/} +IMAGES_PIC_PNG= ${_IMAGES_PIC:S/.pic$$/.png/} +IMAGES_PIC_EPS= ${_IMAGES_PIC:S/.pic$$/.eps/} +IMAGES_PIC_PDF= ${_IMAGES_PIC:S/.pic$$/.pdf/} IMAGES_GEN_PDF+= ${IMAGES_PIC_PDF} ${IMAGES_SCR_PDF} CLEANFILES+= ${IMAGES_GEN_PNG} ${IMAGES_GEN_EPS} ${IMAGES_GEN_PDF} CLEANFILES+= ${IMAGES_SCR_PNG} ${IMAGES_SCR_EPS} ${IMAGES_SCR_TXT} -CLEANFILES+= ${IMAGES_PIC_PNG} ${IMAGES_PIC_EPS} ${_IMAGES_PIC:S/.pic$/.ps/} +CLEANFILES+= ${IMAGES_PIC_PNG} ${IMAGES_PIC_EPS} ${_IMAGES_PIC:S/.pic$$/.ps/} IMAGES_PNG= ${_IMAGES_PNG} ${IMAGES_GEN_PNG} ${IMAGES_SCR_PNG} ${IMAGES_PIC_PNG} IMAGES_EPS= ${_IMAGES_EPS} ${IMAGES_GEN_EPS} ${IMAGES_SCR_EPS} ${IMAGES_PIC_EPS} @@ -187,10 +187,10 @@ .scr.txt: ${SCR2TXT} ${SCR2TXTOPTS} < ${.IMPSRC} | ${SED} -E -e 's/ +$$//' > ${.TARGET} -.pic.png: ${.TARGET:S/.png$/.eps/} - ${EPSGEOM} -offset ${EPSGEOMOPTS} ${.TARGET:S/.png$/.eps/} \ +.pic.png: ${.TARGET:S/.png$$/.eps/} + ${EPSGEOM} -offset ${EPSGEOMOPTS} ${.TARGET:S/.png$$/.eps/} \ | ${EPS2PNM} ${EPS2PNMOPTS} \ - -g`${EPSGEOM} -geom ${EPSGEOMOPTS} ${.TARGET:S/.png$/.eps/}` - \ + -g`${EPSGEOM} -geom ${EPSGEOMOPTS} ${.TARGET:S/.png$$/.eps/}` - \ | ${PNMTOPNG} > ${.TARGET} .pic.ps: @@ -225,7 +225,7 @@ # the targets on the fly. .for _curimage in ${IMAGES_GEN_PNG} -${_curimage}: ${_curimage:S/.png$/.eps/} +${_curimage}: ${_curimage:S/.png$$/.eps/} ${EPSGEOM} -offset ${EPSGEOMOPTS} ${.ALLSRC} \ | ${EPS2PNM} ${EPS2PNMOPTS} \ -g`${EPSGEOM} -geom ${EPSGEOMOPTS} ${.ALLSRC}` - \ @@ -233,13 +233,13 @@ .endfor .for _curimage in ${IMAGES_GEN_EPS} -${_curimage}: ${_curimage:S/.eps$/.png/} +${_curimage}: ${_curimage:S/.eps$$/.png/} ${PNGTOPNM} ${PNGTOPNMOPTS} ${.ALLSRC} | \ ${PNMTOPS} ${PNMTOPSOPTS} > ${.TARGET} .endfor .for _curimage in ${IMAGES_GEN_PDF} -${_curimage}: ${_curimage:S/.pdf$/.eps/} +${_curimage}: ${_curimage:S/.pdf$$/.eps/} ${EPSTOPDF} ${EPSTOPDFOPTS} --outfile=${.TARGET} ${.ALLSRC} .endfor Index: doc.slides.mk =================================================================== RCS file: /home/ncvs/doc/share/mk/doc.slides.mk,v retrieving revision 1.4 diff -u -r1.4 doc.slides.mk --- doc.slides.mk 7 Sep 2004 12:06:22 -0000 1.4 +++ doc.slides.mk 26 Mar 2005 00:36:57 -0000 @@ -65,16 +65,16 @@ ${DOC}.fo: ${SRCS} .if defined(USE_SAXON) - ${SAXON_CMD} ${DOC}.xml ${SLIDES_XSLPRINT} > ${.TARGET:S/.pdf$/.fo/} + ${SAXON_CMD} ${DOC}.xml ${SLIDES_XSLPRINT} > ${.TARGET:S/.pdf$$/.fo/} .else - ${XSLTPROC} ${XSLTPROCOPTS} ${SLIDES_XSLPRINT} ${DOC}.xml > ${.TARGET:S/.pdf$/.fo/} + ${XSLTPROC} ${XSLTPROCOPTS} ${SLIDES_XSLPRINT} ${DOC}.xml > ${.TARGET:S/.pdf$$/.fo/} .endif ${DOC}.pdf: ${DOC}.fo .if defined(USE_FOP) - ${FOP_CMD} ${.TARGET:S/.pdf$/.fo/} ${.TARGET} + ${FOP_CMD} ${.TARGET:S/.pdf$$/.fo/} ${.TARGET} .elif defined(USE_XEP) - ${XEP_CMD} ${.TARGET:S/.pdf$/.fo/} ${.TARGET} + ${XEP_CMD} ${.TARGET:S/.pdf$$/.fo/} ${.TARGET} .else - ${PDFTEX_CMD} --interaction nonstopmode "&pdfxmltex" ${.TARGET:S/.pdf$/.fo/} + ${PDFTEX_CMD} --interaction nonstopmode "&pdfxmltex" ${.TARGET:S/.pdf$$/.fo/} .endif %%%% patch ends here %%%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050326004453.GA51118>