X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=all%2FMakefile;h=9512ac26f7844c844d485b8a63fd2630c7040980;hb=ae1fcefb856336fc42bf409af8c1417f0e736c4d;hp=881976e1cf671668ee2dcb7c6a97c01bc65995e8;hpb=6ad49f93e3a888c9617f6f8b3f0e976ddcc1e0c4;p=ads2.git

diff --git a/all/Makefile b/all/Makefile
index 881976e..9512ac2 100644
--- a/all/Makefile
+++ b/all/Makefile
@@ -1,9 +1,8 @@
 P=ads2
-X:=$(shell for a in 1 2 3 4 ; do echo ../$$a-*/$$a-*.tex ; done)
+X:=$(shell ls ../*-*/*-*.tex | sort -t/ -k2 -n)
 
 %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'