X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=all%2FMakefile;h=145cca1efc2305c8d95122e6a40de9d02b062ce0;hb=7be23343f72bc21cbcf857e126fcda43bd86407f;hp=9c4b409054522108781816cbe84f98b597532470;hpb=81383c3b1ab213e35aaaf31e18368dde88b75656;p=ads2.git

diff --git a/all/Makefile b/all/Makefile
index 9c4b409..145cca1 100644
--- a/all/Makefile
+++ b/all/Makefile
@@ -1,12 +1,11 @@
-P=ads
-X:=$(shell for a in 1 2 3 4 5 6 8 9 10 11 12 13 ; do echo ../$$a-*/$$a-*.tex ; done)
+P=ads2
+X:=$(shell echo ../*-*/*-*.tex)
 
 %universe: all ChangeLog
 
-CUSTOM_UPLOAD=1
 include ../Makerules
 
-ads.dvi: ads.tex body.tex
+ads2.dvi: ads2.tex body.tex
 
 body.tex: $(X) preprocess
 	./preprocess $(X) >$@
@@ -18,8 +17,6 @@ clean::
 	rm -f body.tex ChangeLog
 
 upload::
-	make $P.ps $P-2in1.ps
-	scp -C $P.ps $P-2in1.ps jabberwock:www/vyuka/0607/ads1/
-	( cd .. && make clean )
-	( cd ../.. && tar czf - --exclude .git ads ) | ssh jabberwock 'cd www/vyuka/0607/ads1/ && cat >ads.tar.gz.new && mv ads.tar.gz.new ads.tar.gz'
-	make ChangeLog && cat ChangeLog | ssh jabberwock 'cd www/vyuka/0607/ads1 && cat >ChangeLog.new && mv ChangeLog.new ChangeLog'
+#	( cd .. && make clean )
+# ( cd ../.. && tar czf - --exclude .git ads2 ) | ssh jabberwock 'cd www/$UPDIR/ && cat >ads2.tar.gz.new && mv ads2.tar.gz.new ads2.tar.gz'
+	make ChangeLog && cat ChangeLog | ssh jabberwock 'cd www/$(UPDIR) && cat >ChangeLog.new && mv ChangeLog.new ChangeLog'