From 6c9a428eeee14968305398ed6fb3b3e97f17495d Mon Sep 17 00:00:00 2001 From: Marc Fonvieille Date: Sat, 2 Nov 2002 21:45:53 +0000 Subject: [PATCH] Remove my dirty hack, it's useless with doc.docbook.mk changes. --- share/mk/doc.images.mk | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/share/mk/doc.images.mk b/share/mk/doc.images.mk index 149e0b2880..e06e0f353e 100644 --- a/share/mk/doc.images.mk +++ b/share/mk/doc.images.mk @@ -131,18 +131,20 @@ REALPATH?= /bin/realpath # Use suffix rules to convert .scr files to other formats .SUFFIXES: .scr .pic .png .eps .txt -# The .txt files are built on the fly with .png files. -# The .txt files need to have any trailing spaces trimmed from -# each line, which is why the output from ${SCR2TXT} is run -# through ${SED} .scr.png: ${SCR2PNG} ${SCR2PNGOPTS} < ${.IMPSRC} > ${.TARGET} - ${SCR2TXT} ${SCR2TXTOPTS} < ${.IMPSRC} | ${SED} -E -e 's/ +$$//' > ${.TARGET:S/.png$/.txt/} + .scr.eps: ${SCR2PNG} ${SCR2PNGOPTS} < ${.ALLSRC} | \ ${PNGTOPNM} ${PNGTOPNMOPTS} | \ ${PNMTOPS} ${PNMTOPSOPTS} > ${.TARGET} +# The .txt files need to have any trailing spaces trimmed from +# each line, which is why the output from ${SCR2TXT} is run +# through ${SED} +.scr.txt: + ${SCR2TXT} ${SCR2TXTOPTS} < ${.IMPSRC} | ${SED} -E -e 's/ +$$//' > ${.TARGET} + # Some versions of ghostscript (7.04) have problems with the use of # relative path when the arguments are passed by peps; realpath will # correct the problem.