Prechod na novy format sazby

[ads1.git] / Makerules

diff --git a/Makerules b/Makerules
index 14eeea9c30d9b397b4f1df56988bba0d12c2c241..82e3eaca162b1a77b86ca9aa995ed68058466c82 100644 (file)
--- a/Makerules
+++ b/Makerules
@@ -1,26 +1,14 @@
-export TEXINPUTS=.:..:
+export TEXINPUTS=.:..:../ucw:
 
-all: $P.ps
+all: $P.ps $P.pdf
 
-%.dvi: %.tex ../lecnotes.tex ../mjmac.tex
+%.dvi: %.tex ../lecnotes.tex
        csplain $<
 
-#%.pdf: %.tex ../lecnotes.tex ../mjmac.tex
-#      pdfcsplain $<
-
 %.ps: %.dvi
-       dvips -D600 -o $@ -O-15.4mm,-15.4mm -t a5 $<
-
-%.pdf: %.dvi
-       dvipdfm -o $@ -x 9mm -y 9mm -p a5 -r 600 -z 9 $<
-
-%-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/' | pstopsfix >$@
-
-%-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/' | pstopsfix >$@
+       dvips -D600 -o $@ -t a5 $<
 
-%-booklet.pdf: %-booklet.ps
+%.pdf: %.ps
        ps2pdf $< $@
 
 mostlyclean:
@@ -31,8 +19,8 @@ clean:: mostlyclean
 
 ifndef CUSTOM_UPLOAD
 upload::
-       make $P-booklet.pdf
-       scp -C $P-booklet.pdf jabberwock:www/vyuka/0809/ads1/$P-booklet.pdf
+       make $P.pdf
+       rsync $P.pdf jabberwock:www/vyuka/1011/ads1/$P.pdf
 endif
 
 .SECONDARY: