X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=Makefile-web;h=125945a0dab8d318d534d0d86d642841847419e5;hp=7093a48d162457caeb9ffc5e0c691af9ebd76f43;hb=94ff9fc87d90173145772a41f79987988f9f0972;hpb=e5ee09b20d276ea2e86d0a5c7e9b1469f83f0ac1

diff --git a/Makefile-web b/Makefile-web
index 7093a48d..125945a0 100644
--- a/Makefile-web
+++ b/Makefile-web
@@ -21,8 +21,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 +59,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)