Page MenuHomeFreeBSD
Files F145603767

D24560.id70957.diff
No OneTemporary
Actions

D24560.id70957.diff
View Options

Index: share/mk/doc.images.mk
===================================================================
--- share/mk/doc.images.mk
+++ share/mk/doc.images.mk
@@ -96,6 +96,13 @@
# Use suffix rules to convert .scr files to other formats
.SUFFIXES: .scr .pic .png .ps .eps .txt
+#
+# There are many rules around here that use > ${.TARGET}
+# so that on failure, may leave corrupt files behind.
+# Make sure to remove them.
+#
+.DELETE_ON_ERROR:
+
.scr.png:
${SCR2PNG} ${SCR2PNGOPTS} < ${.IMPSRC} > ${.TARGET}
@@ -145,8 +152,8 @@
# (the older versions calculated BBox directly in ps2epsi.ps).
.ps.eps:
tmpfile=$$(mktemp ${.TARGET}.XXXXXXXX); \
- ${PS2BBOX} ${PS2BBOXOPTS} ${.ALLSRC} > $$tmpfile 2>&1; \
- ${SETENV} outfile=$$tmpfile ${PS2EPS} ${PS2EPSOPTS} < ${.ALLSRC} 1>&2; \
+ ${PS2BBOX} ${PS2BBOXOPTS} ${.ALLSRC} 2> $$tmpfile >$$tmpfile.err && \
+ ${SETENV} outfile=$$tmpfile ${PS2EPS} ${PS2EPSOPTS} < ${.ALLSRC} >>$$tmpfile.err 2>&1 && \
(echo "save countdictstack mark newpath /showpage {} def /setpagedevice {pop} def";\
echo "%%EndProlog";\
echo "%%Page: 1 1";\
@@ -161,7 +168,9 @@
echo "cleartomark countdictstack exch sub { end } repeat restore";\
echo "%%EOF";\
) >> $$tmpfile; \
- ${MV} -f $$tmpfile ${.TARGET}
+ test ! -s $$tmpfile.err && \
+ { ${MV} -f $$tmpfile ${.TARGET} ; ${RM} -f $$tmpfile.err ; } \
+ || { ${CAT} $$tmpfile.err ; ${RM} -f $$tmpfile.err $$tmpfile ; false ; }
# We can't use suffix rules to generate the rules to convert EPS to PNG and
# PNG to EPS. This is because a .png file can depend on a .eps file, and
Index: share/pgpkeys/Makefile
===================================================================
--- share/pgpkeys/Makefile
+++ share/pgpkeys/Makefile
@@ -10,6 +10,8 @@
.ORDER: pgpkeyring pgpkeyring.txt
.ORDER: keyring.xml pgpkeyring.txt
+.DELETE_ON_ERROR:
+
all: keyring.xml pgpkeyring pgpkeyring.txt
keyring.xml: .PHONY

File Metadata

Mime Type
text/plain
Expires
Mon, Feb 23, 1:48 AM (6 h, 49 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28948511
Default Alt Text
D24560.id70957.diff (1 KB)

Event Timeline