Makefile: fixes for pdf/eps generation

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/Makefile b/Makefile
index 66494c02f2c601017c65379ca47b77e27158f87b..05473cefa67814c803e80c3fe44d03ac9258347f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,8 @@ all:  $(PUBLISH)
 
 # Don't print the ps, printers (eg ours!) don't always have the fonts
 
-o=>$@.new && mv -f $@.new $@
+i=mv -f $@.new $@
+o=>$@.new && $i
 use_rsvg=rsvg-convert -f png -o $@.tmp.png $<
 shell_pipe=set -o pipefail; set -e;
 make_pnm = pnmdepth 255 | pnmnoraw $o
@@ -62,12 +63,13 @@ droplet.ppm: droplet.svg Makefile
        | $(make_pnm)
 
 $(addsuffix .ps, $(BOOK_STEMS)): pumpkin-books.ps
+       @:
 
 book-%.pdf: book-%.eps
-       rm -f $@; ps2pdf $<
+       rm -f $@.new; ps2pdf $< $@.new && $i
 
 book-%.eps: book-%.ps
-       rm -f $@; ps2eps $<
+       ps2eps <$< $o
 
 book-%.png: book-%.eps Makefile
        gm convert -density 100x100 $< $@