When building webpages, skip clean-tree check if WEBDEV flag is set.

[ccan] / Makefile-web

diff --git a/Makefile-web b/Makefile-web
index 20a1a2f3e70c039d121282ddc7fa379124487ae8..bf8550d7fd2dd0bd1a5d6605df57f4d075d43a31 100644 (file)
--- a/Makefile-web
+++ b/Makefile-web
@@ -18,7 +18,7 @@ modcheck:
        @FOUND=$$(echo $$(find ccan -name _info | sed 's,ccan/\(.*\)/_info,\1,' | sort) ); LISTED=$$(echo $$(echo $(MODS) | tr ' ' '\012' | sort) ); if [ "$$FOUND" = "$$LISTED" ]; then exit 0; fi; while true; do a="$${FOUND%% *}"; b="$${LISTED%% *}"; if [ "$$a" != "$$b" ]; then echo "$$a found but $$b in MOD" >&2; exit 1; fi; FOUND="$${FOUND#* }"; LISTED="$${LISTED#* }"; done
 
 clean-tree:
-       ! git status --porcelain | grep .
+       [ "$(WEBDEV)" ] || ! git status --porcelain | grep .
 
 webpages: modcheck clean-tree $(WEB_SUBDIRS) $(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 $(ALL_PAGES) junkpages
 
@@ -31,7 +31,7 @@ $(WEBDIR)/junkcode/%.tar.bz2: junkcode/% $(WEBDIR)/junkcode
 
 $(WEBDIR)/junkcode/%.html: $(WEBDIR)/junkcode/%.tar.bz2
        cd $(WEBDIR) && tar xfj junkcode/$*.tar.bz2
-       php5 web/staticjunkcode.php junkcode/$* $* > $@
+       URLPREFIX=../ php5 web/staticjunkcode.php junkcode/$* $* > $@
 
 # We want tarball to contain ccan/; we put junkcode in, but don't depend on it.
 $(WEBDIR)/ccan.tar.bz2: config.h Makefile Makefile-ccan $(shell git ls-files ccan tools licenses)