From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 26 Oct 2021 23:43:49 +0000 (+0100)
Subject: prep for ppm
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=851044b5319a5be9ac77323d17b6cf98bea62f4e;p=quacks.git

prep for ppm
---

diff --git a/Makefile b/Makefile
index dfab893..2ffbfb1 100644
--- a/Makefile
+++ b/Makefile
@@ -7,12 +7,13 @@ all:	pumpkin-books.pdf
 
 # Don't print the ps, printers (eg ours!) don't always have the fonts
 
+o=>$@.new && mv -f $@.new $@
 use_rsvg=rsvg-convert -f png -o $@.tmp.png $<
 shell_pipe=set -o pipefail; set -e;
-make_pgm = pnmdepth 255 | pnmnoraw >$@.tmp.new; mv -f $@.tmp.new $@
+make_pnm = pnmdepth 255 | pnmnoraw $o
 
 pumpkin-books.ps: pumpkin-books.ps.pl bag.pgm pot.pgm
-	./$< >$@.new && mv -f $@.new $@
+	./$< $o
 
 pumpkin-books.pdf: pumpkin-books.ps
 	gs -q -dNOPAUSE -dBATCH -dPDFSETTINGS=/prepress \
@@ -23,7 +24,7 @@ bag.pgm: Sack_-_Sac_-_Zak_brown.svg Makefile
 	$(shell_pipe)					\
 	pngtopnm <$@.tmp.png -mix -background 'white'	\
 	| ppmtopgm 					\
-	| $(make_pgm)
+	| $(make_pnm)
 
 pot.pgm: 146_Kaldrono.svg Makefile
 	$(use_rsvg)
@@ -31,7 +32,7 @@ pot.pgm: 146_Kaldrono.svg Makefile
 	pngtopnm <$@.tmp.png 				\
 	| ppmtopgm 					\
 	| pnminvert 					\
-	| $(make_pgm)
+	| $(make_pnm)
 
 pubssh=c
 pubpath=games-rules/quacks