From: Martin Mares <mj@ucw.cz>
Date: Wed, 17 Jan 2007 16:35:10 +0000 (+0100)
Subject: Na web generuje 2in1 cele knizky, ne booklet.
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=e3e95e7490fcf02d42058d5d4ee1c8a6cc76d5d3;p=ga.git

Na web generuje 2in1 cele knizky, ne booklet.
---

diff --git a/Makerules b/Makerules
index 94309e8..0877f11 100644
--- a/Makerules
+++ b/Makerules
@@ -21,8 +21,10 @@ mostlyclean:
 clean:: mostlyclean
 	rm -f *.ps *.pdf
 
+ifndef CUSTOM_UPLOAD
 upload::
-	make $P.ps
-	scp -C $P.ps jabberwock:www/vyuka/ga/$P.ps
+	make $P-booklet.ps
+	scp -C $P-booklet.ps jabberwock:www/vyuka/ga/$P-booklet.ps
+endif
 
 .SECONDARY:
diff --git a/all/Makefile b/all/Makefile
index 160ab7b..e936283 100644
--- a/all/Makefile
+++ b/all/Makefile
@@ -3,6 +3,7 @@ X=$(shell for a in 0 1 2 3 4 5 6 7 8 9 10 11 ; do echo ../$$a-*/$$a-*.tex ; done
 
 universe: all ChangeLog
 
+CUSTOM_UPLOAD=1
 include ../Makerules
 
 ga.dvi: ga.tex body.tex
@@ -17,8 +18,8 @@ clean::
 	rm -f body.tex ChangeLog
 
 upload::
-	make $P.ps
-	scp -C $P.ps jabberwock:www/vyuka/ga/$P.ps
+	make $P.ps $P-2in1.ps
+	scp -C $P.ps $P-2in1.ps 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'