Stephen Thorne points out that ccan tarball should create ccan dir.

diff --git a/Makefile-web b/Makefile-web
index d8790626db53b7232def7a39219ee1ed413d8134..125945a0dab8d318d534d0d86d642841847419e5 100644 (file)
--- 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/$* $* > $@
 
        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)
 $(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
 
 
 $(ALL_PAGES): tools/doc_extract web/staticmoduleinfo.php