From 18a537a9469ef589ec7cb6e6e54f7563d95d6e29 Mon Sep 17 00:00:00 2001
From: Martin Mares <mj@ucw.cz>
Date: Tue, 26 Oct 2010 21:51:25 +0200
Subject: [PATCH] Uklid v Makefilech (uz negenerujeme PDFka 2 stranky na 1)

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

diff --git a/Makerules b/Makerules
index 4c57ce5..f8dad28 100644
--- a/Makerules
+++ b/Makerules
@@ -5,18 +5,9 @@ all: $P.ps
 %.dvi: %.tex ../sgr.tex ../ga.bib
 	csplain $< && if grep -q citation $*.aux ; then bibtex $* && csplain $< && csplain $< ; fi
 
-#%.pdf: %.tex ../sgr.tex ../ga.bib
-#	pdfcsplain $<
-
 %.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/' >$@
-
-#%-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 $< $@
 
@@ -34,8 +25,8 @@ clean:: mostlyclean
 
 ifndef CUSTOM_UPLOAD
 upload::
-	make $P-booklet.pdf
-	scp -C $P-booklet.pdf jabberwock:www/vyuka/ga/
+	make $P.pdf
+	scp -C $P.pdf jabberwock:www/vyuka/ga/
 endif
 
 .SECONDARY:
diff --git a/all/Makefile b/all/Makefile
index fcee02d..0abe4c8 100644
--- a/all/Makefile
+++ b/all/Makefile
@@ -18,8 +18,8 @@ clean::
 	rm -f body.tex ChangeLog
 
 upload::
-	make $P.pdf $P-2in1.pdf
-	scp -C $P.pdf $P-2in1.pdf jabberwock:www/vyuka/ga/
+	make $P.pdf
+	scp -C $P.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'
 	make ChangeLog && cat ChangeLog | ssh jabberwock 'cd www/vyuka/ga && cat >ChangeLog.new && mv ChangeLog.new ChangeLog'
-- 
2.39.5