X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=all%2FMakefile;h=145cca1efc2305c8d95122e6a40de9d02b062ce0;hb=b50fc99c4d4a78d7e1e001d603f93c49670ba594;hp=ea6f7f59f3971596d069e1d5faa36e4ffe84ad53;hpb=075a28c6e7227aeaf9f0486e099ba18da0a9c289;p=ads2.git

diff --git a/all/Makefile b/all/Makefile
index ea6f7f5..145cca1 100644
--- a/all/Makefile
+++ b/all/Makefile
@@ -1,9 +1,8 @@
 P=ads2
-X:=$(shell for a in 1 2 3 4 5 6 7 8 9 10 11 12 13 ; do echo ../$$a-*/$$a-*.tex ; done)
+X:=$(shell echo ../*-*/*-*.tex)
 
 %universe: all ChangeLog
 
-CUSTOM_UPLOAD=1
 include ../Makerules
 
 ads2.dvi: ads2.tex body.tex
@@ -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/0708/ads2/
-	( cd .. && make clean )
-	( cd ../.. && tar czf - --exclude .git ads2 ) | ssh jabberwock 'cd www/vyuka/0708/ads2/ && cat >ads2.tar.gz.new && mv ads2.tar.gz.new ads2.tar.gz'
-	make ChangeLog && cat ChangeLog | ssh jabberwock 'cd www/vyuka/0708/ads2 && 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'