Na web generuje 2in1 cele knizky, ne booklet.

diff --git a/Makerules b/Makerules
index 94309e82ff00e112f8baa7f97ee7e5cc92bb9b8b..0877f11167701fb777b3f92f63e9b098de62fd60 100644 (file)
--- 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 160ab7bde43c08cccac97dba5bfb41ad1e8a1b88..e9362833fcf78f289b428cfdf954342ce7e11708 100644 (file)
--- 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'