Opraveno uploadovaci pravidlo, PDFka uz nejsou orezana.

[ads2.git] / Makerules

diff --git a/Makerules b/Makerules
index 01e71faa89598dcefbff35620828e5bd02886c8d..cf70fe3978b1be9cb891a827b707335a1f7f4190 100644 (file)
--- a/Makerules
+++ b/Makerules
@@ -1,24 +1,24 @@
 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)' | sed 's/^%%BoundingBox: .*/%%BoundingBox: 0 0 595 842/;s/^%%DocumentPaperSizes:.*/%%DocumentPaperSizes: a4\n%%Orientation: Landscape/' >$@
+       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/' >$@
 
 %-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/' >$@
+       pstops '2:0L(210mm,0mm)+1L(210mm,148mm)' <$< | ../utils/pstopsfix | sed 's/^%%BoundingBox: .*/%%BoundingBox: 0 0 595 842/;s/^%%DocumentPaperSizes:.*/%%DocumentPaperSizes: a4\n%%Orientation: Landscape/' >$@
 
 mostlyclean:
        rm -f *.dvi *.log *~ core *.o *.aux *.bbl *.blg
@@ -28,8 +28,8 @@ clean:: mostlyclean
 
 ifndef CUSTOM_UPLOAD
 upload::
-       make $P-booklet.ps
-       scp -C $P-booklet.ps jabberwock:www/vyuka/0607/ads1/$P-booklet.ps
+       make $P.pdf
+       scp -C $P.pdf jabberwock:www/vyuka/0910/ads2/$P.pdf
 endif
 
 .SECONDARY: