Uklid v Makefilech (uz negenerujeme PDFka 2 stranky na 1)

diff --git a/Makerules b/Makerules
index 4c57ce5a83e6472cf6b7d829877f724f9576d2ba..f8dad2818baa048818dc15478557e0dd9c59abbb 100644 (file)
--- 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 fcee02db9e9ec6e4cdb7939dd34728eb122355a1..0abe4c8b9f09d149004b28b367c291acfdf52f6b 100644 (file)
--- 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'