Sazba: mezera mezi nadpisem a carou nesmi byt pruzna.

[ga.git] / Makerules

diff --git a/Makerules b/Makerules
index 4db44134d348eb906e71df257e2544576384a5a1..0877f11167701fb777b3f92f63e9b098de62fd60 100644 (file)
--- a/Makerules
+++ b/Makerules
@@ -1,37 +1,30 @@
 all: $P.ps
 
 %.dvi: %.tex ../sgr.tex ../ga.bib
-       csplain $<
-       bibtex $*
-       csplain $<
-       csplain $<      # BibTeX requires 3 passes of TeXing!
+       csplain $< && if grep -q citation $*.aux ; then bibtex $* && csplain $< && csplain $< ; fi
 
-%.pdf: %.tex ../sgr.tex
+%.pdf: %.tex ../sgr.tex ../ga.bib
        pdfcsplain $<
 
-%-700.tex: %.tex
-       ( echo '\magnification=700' ; cat $< ) >$@
-
 %.ps: %.dvi
-       dvips -D600 -o $@ -O-0.5in,-0.5in -t a4 $<
-
-%-a5.ps: %-700.dvi
-       dvips -D600 -o $@ -O-1in,-1in -T148mm,210mm $<
+       dvips -D600 -o $@ -O-15.4mm,-15.4mm -t a5 $<
 
-%-booklet.ps: %-a5.ps
-       psbook <$< | pstops '2:0L(210mm,0)+1L(210mm,148mm)' | sed 's/^%%BoundingBox: .*/%%BoundingBox: 0 0 595 842/' >$@
+%-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: %-a5.ps
-       pstops '2:0L(212mm,0mm)+1L(212mm,150mm)' <$< | sed 's/^%%BoundingBox: .*/%%BoundingBox: 0 0 595 842/' >$@
+%-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/' >$@
 
 mostlyclean:
-       rm -f *.dvi *.log *~ core *.o *-700.tex *-a5.ps *.aux *.bbl *.blg
+       rm -f *.dvi *.log *~ core *.o *.aux *.bbl *.blg
 
 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: