From 25cd45b923dda63c2e4d76660f7bc54ce956eec3 Mon Sep 17 00:00:00 2001
From: Martin Mares <mj@ucw.cz>
Date: Sun, 25 Oct 2009 22:48:23 +0100
Subject: [PATCH] Uprava Makefiles, aby uploadovaly PDF misto PostScriptu.

---
 Makerules    | 24 +++++++++++++++---------
 all/Makefile |  8 ++++----
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/Makerules b/Makerules
index 797f6f3..4c57ce5 100644
--- a/Makerules
+++ b/Makerules
@@ -8,17 +8,23 @@ all: $P.ps
 #%.pdf: %.tex ../sgr.tex ../ga.bib
 #	pdfcsplain $<
 
-%.pdf: %.ps
-	ps2pdf $< $@
-
 %.ps: %.dvi
 	dvips -D600 -o $@ -O-15.4mm,-15.4mm -t a5 $<
 
-%-booklet.ps: %.ps
-	psbook <$< | pstops '2:0L(210mm,0)+1L(210mm,148mm)' | sed 's/^%%BoundingBox: .*/%%BoundingBox: 0 0 595 842/;s/^%%DocumentPaperSizes:.*/%%DocumentPaperSizes: a4\n%%Orientation: Landscape/' >$@
+#%-booklet.ps: %.ps
+#	psbook <$< | pstops '2:0L(210mm,0)+1L(210mm,148mm)' | 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)' <$< | sed 's/^%%BoundingBox: .*/%%BoundingBox: 0 0 595 842/;s/^%%DocumentPaperSizes:.*/%%DocumentPaperSizes: a4\n%%Orientation: Landscape/' >$@
+
+%.pdf: %.ps
+	ps2pdf $< $@
+
+%-2in1.pdf: %.pdf
+	pspdftool 'nup(2, paper=a4)' $< $@
 
-%-2in1.ps: %.ps
-	pstops '2:0L(210mm,0mm)+1L(210mm,148mm)' <$< | sed 's/^%%BoundingBox: .*/%%BoundingBox: 0 0 595 842/;s/^%%DocumentPaperSizes:.*/%%DocumentPaperSizes: a4\n%%Orientation: Landscape/' >$@
+%-booklet.pdf: %.pdf
+	pspdftool 'book nup(2, paper=a4)' $< $@
 
 mostlyclean:
 	rm -f *.dvi *.log *~ core *.o *.aux *.bbl *.blg *.toc
@@ -28,8 +34,8 @@ clean:: mostlyclean
 
 ifndef CUSTOM_UPLOAD
 upload::
-	make $P-booklet.ps
-	scp -C $P-booklet.ps jabberwock:www/vyuka/ga/$P-booklet.ps
+	make $P-booklet.pdf
+	scp -C $P-booklet.pdf jabberwock:www/vyuka/ga/
 endif
 
 .SECONDARY:
diff --git a/all/Makefile b/all/Makefile
index 0f930d5..fcee02d 100644
--- a/all/Makefile
+++ b/all/Makefile
@@ -1,5 +1,5 @@
 P=ga
-X=$(shell for a in 0 1 2 3 4 5 6 7 8 9 10 11 ; do echo ../$$a-*/$$a-*.tex ; done)
+X=$(shell for a in 0 1 2 3 4 5 6 7 8 9 10 11 12 ; do echo ../$$a-*/$$a-*.tex ; done)
 
 universe: all ChangeLog
 
@@ -18,8 +18,8 @@ clean::
 	rm -f body.tex ChangeLog
 
 upload::
-	make $P.ps $P-2in1.ps
-	scp -C $P.ps $P-2in1.ps jabberwock:www/vyuka/ga/
+	make $P.pdf $P-2in1.pdf
+	scp -C $P.pdf $P-2in1.pdf jabberwock:www/vyuka/ga/
 	( cd .. && make clean )
-	( cd ../.. && tar czf - --exclude .git ga ) | ssh jabberwock 'cd www/vyuka/ga/ && cat >ga.tar.gz.new && mv ga.tar.gz.new ga.tar.gz'
+# ( cd ../.. && tar czf - --exclude .git ga ) | ssh jabberwock 'cd www/vyuka/ga/ && cat >ga.tar.gz.new && mv ga.tar.gz.new ga.tar.gz'
 	make ChangeLog && cat ChangeLog | ssh jabberwock 'cd www/vyuka/ga && cat >ChangeLog.new && mv ChangeLog.new ChangeLog'
-- 
2.39.5