Uploadujeme PDF, ne PS-booklet.

diff --git a/1-toky/1-toky.tex b/1-toky/1-toky.tex
index fe5b8f9ea4c6c1d3a7f01f75c63fef18e740793e..585f8b1f9de0eddfd1a5222d028f13f2b79973e8 100644 (file)
--- a/1-toky/1-toky.tex
+++ b/1-toky/1-toky.tex
@@ -1,6 +1,6 @@
 \input lecnotes.tex
 
-\prednaska{2}{Toky v sítích}{(zapsala Markéta Popelová)}
+\prednaska{1}{Toky v sítích}{(zapsala Markéta Popelová)}
 
 \s{Motivaèní úloha:} Rozvod èajovodu do~v¹ech uèeben
 

diff --git a/Makerules b/Makerules
index e3910b9308fda9bfdb9bed85f3241f88701e430d..432feb769ac5d05ef8de09c6838b85ed33c0d27f 100644 (file)
--- a/Makerules
+++ b/Makerules
@@ -1,18 +1,18 @@
 export TEXINPUTS=.:..:
 
-all: $P.ps
+all: $P.pdf
 
 %.dvi: %.tex ../lecnotes.tex ../mjmac.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 $<
+#%.pdf: %.dvi
+#      dvipdfm -o $@ -x 9mm -y 9mm -p a5 -r 600 -z 9 $<
+
+%.pdf: %.ps
+       ps2pdf13 $< $@
 
 %-booklet.ps: %.ps
        psbook <$< | pstops '2:0L(210mm,0)+1L(210mm,148mm)' | ../utils/pstopsfix | sed 's/^%%BoundingBox: .*/%%BoundingBox: 0 0 595 842/;s/^%%DocumentPaperSizes:.*/%%DocumentPaperSizes: a4\n%%Orientation: Landscape/' >$@
@@ -28,8 +28,8 @@ clean:: mostlyclean
 
 ifndef CUSTOM_UPLOAD
 upload::
-       make $P-booklet.ps
-       scp -C $P-booklet.ps jabberwock:www/vyuka/0708/ads2/$P-booklet.ps
+       make $P-booklet.pdf
+       scp -C $P-booklet.pdf jabberwock:www/vyuka/0910/ads2/$P.pdf
 endif
 
 .SECONDARY: