X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;ds=sidebyside;f=Makefile-web;h=a14b11ab1083abf1a5d146ec0c66f6f348ea6acf;hb=04160dbda10c78fbd4ee452d0af89d540e20b09a;hp=7093a48d162457caeb9ffc5e0c691af9ebd76f43;hpb=e5ee09b20d276ea2e86d0a5c7e9b1469f83f0ac1;p=ccan

diff --git a/Makefile-web b/Makefile-web
index 7093a48d..a14b11ab 100644
--- a/Makefile-web
+++ b/Makefile-web
@@ -9,6 +9,9 @@ JUNKDIRS=$(wildcard junkcode/*)
 JUNKPAGES=$(JUNKDIRS:%=$(WEBDIR)/%.html)
 JUNKBALLS=$(JUNKDIRS:%=$(WEBDIR)/%.tar.bz2)
 
+upload: check webpages
+	send-web # Rusty's upload script.
+	
 webpages: $(WEB_SUBDIRS) $(WEBDIR)/junkcode $(ALL_PAGES) $(WEBDIR)/list.html $(WEBDIR)/index.html $(WEBDIR)/upload.html $(WEBDIR)/uploader.php $(WEBDIR)/example-config.h $(WEBDIR)/ccan.jpg $(DIRECT_TARBALLS) $(DEPEND_TARBALLS) $(WEBDIR)/ccan.tar.bz2 $(WEBDIR)/Makefile-ccan $(JUNKPAGES) $(JUNKBALLS)
 
 $(WEB_SUBDIRS):
@@ -21,8 +24,9 @@ $(WEBDIR)/junkcode/%.html: $(WEBDIR)/junkcode/%.tar.bz2
 	cd $(WEBDIR) && tar xfj junkcode/$*.tar.bz2
 	php5 web/staticjunkcode.php junkcode/$* $* > $@
 
+# We want tarball to contain ccan/
 $(WEBDIR)/ccan.tar.bz2: config.h Makefile Makefile-ccan $(shell bzr ls --versioned --kind=file ccan) $(shell bzr ls --versioned --kind=file tools)
-	tar cvfj $@ $^
+	DIR=`pwd` && cd /tmp && ln -sf "$$DIR" ccan && tar cvfj $@ `for f in $^; do echo ccan/$$f; done` && rm ccan
 
 $(ALL_PAGES): tools/doc_extract web/staticmoduleinfo.php
 
@@ -58,4 +62,6 @@ $(WEBDIR)/tarballs/with-deps/%.tar.bz2: ccan/% ccan/%/test tools/ccan_depends
 	tar cvfj $@ $$(echo ccan/$* $$(tools/ccan_depends ccan/$*) | xargs -n 1 bzr ls --versioned --kind=file)
 
 distclean: distclean-web
+
+distclean-web:
 	rm -rf $(WEBDIR)