X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=Makerules;h=b65bc88553464b00f0ef4c9f6f319a4cd405f551;hb=1b629daa4cb37c907c051aca7f5a96a53f31b941;hp=e3910b9308fda9bfdb9bed85f3241f88701e430d;hpb=bfc2aa2af55a14b6a12b86ad04acf084851165ea;p=ads2.git

diff --git a/Makerules b/Makerules
index e3910b9..b65bc88 100644
--- a/Makerules
+++ b/Makerules
@@ -1,24 +1,15 @@
-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 $<
+	dvips -D600 -o $@ -t a5 $<
 
-%-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/' >$@
-
-%-2in1.ps: %.ps
-	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/' >$@
+%.pdf: %.ps
+	ps2pdf $< $@
 
 mostlyclean:
 	rm -f *.dvi *.log *~ core *.o *.aux *.bbl *.blg
@@ -26,10 +17,13 @@ mostlyclean:
 clean:: mostlyclean
 	rm -f *.ps *.pdf
 
+UPDIR=vyuka/1112/ads2
+
 ifndef CUSTOM_UPLOAD
 upload::
-	make $P-booklet.ps
-	scp -C $P-booklet.ps jabberwock:www/vyuka/0708/ads2/$P-booklet.ps
+	make $P.pdf
+	rsync $P.pdf jabberwock:www/$(UPDIR)/$P.pdf
+	ssh jabberwock 'cd www && date "+%Y-%m-%d" >$(UPDIR)/$(P).stamp && make'
 endif
 
 .SECONDARY: