X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=Makerules;h=af8215cefabfe8c818cece60b6d017ed7dd85315;hb=3b6363b3c3be5b7c9d0b32464be02e20a8f7ee6b;hp=21d381f7573d92bf81ce2c92d872e2ad474a6917;hpb=30668653bcc9df42b7082a7a92bde079603ddef2;p=ads2.git

diff --git a/Makerules b/Makerules
index 21d381f..af8215c 100644
--- a/Makerules
+++ b/Makerules
@@ -18,11 +18,17 @@ all: $P.pdf
 %.pdf: %.ps
 	ps2pdf13 $< $@
 
-%-booklet.ps: %.ps
-	psbook <$< | pstops '2:0L(210mm,0)+1L(210mm,148mm)' | ../utils/pstopsfix | sed 's/^%%BoundingBox: .*/%%BoundingBox: 0 0 595 842/;s/^%%DocumentPaperSizes:.*/%%DocumentPaperSizes: a4\n%%Orientation: Landscape/' >$@
+%-booklet.pdf: %.pdf
+	pspdftool 'book nup(2, paper=a4)' $< $@
 
-%-2in1.ps: %.ps
-	pstops '2:0L(210mm,0mm)+1L(210mm,148mm)' <$< | ../utils/pstopsfix | sed 's/^%%BoundingBox: .*/%%BoundingBox: 0 0 595 842/;s/^%%DocumentPaperSizes:.*/%%DocumentPaperSizes: a4\n%%Orientation: Landscape/' >$@
+%-2in1.pdf: %.pdf
+	pspdftool 'nup(2, paper=a4)' $< $@
+
+#%-booklet.ps: %.ps
+#	psbook <$< | pstops '2:0L(210mm,0)+1L(210mm,148mm)' | ../utils/pstopsfix | sed 's/^%%BoundingBox: .*/%%BoundingBox: 0 0 595 842/;s/^%%DocumentPaperSizes:.*/%%DocumentPaperSizes: a4\n%%Orientation: Landscape/' >$@
+#
+#%-2in1.ps: %.ps
+#	pstops '2:0L(210mm,0mm)+1L(210mm,148mm)' <$< | ../utils/pstopsfix | sed 's/^%%BoundingBox: .*/%%BoundingBox: 0 0 595 842/;s/^%%DocumentPaperSizes:.*/%%DocumentPaperSizes: a4\n%%Orientation: Landscape/' >$@
 
 %.stamp: force
 	date '+%Y-%m-%d' >$@
@@ -33,7 +39,7 @@ mostlyclean:
 	rm -f *.dvi *.log *~ core *.o *.aux *.bbl *.blg
 
 clean:: mostlyclean
-	rm -f *.ps *.pdf
+	rm -f *.ps *.pdf *.stamp
 
 UPDIR=vyuka/0910/ads2
 ifndef CUSTOM_UPLOAD
@@ -44,3 +50,5 @@ upload::
 endif
 
 .SECONDARY:
+
+.PHONY: force upload clean mostlyclean