From eefefbaee15ea270992c958f6a9b145cdc017e44 Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Wed, 31 Mar 2010 23:25:56 +1030
Subject: [PATCH] Fix segfault due to relative paths (ccan_depends), and
 generate pages for ignored modules too.

---
 Makefile-web | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Makefile-web b/Makefile-web
index 0e44ab2e..76c52749 100644
--- a/Makefile-web
+++ b/Makefile-web
@@ -1,9 +1,11 @@
 # This can be overridden on cmdline to generate pages elsewhere.
 WEBDIR=/home/rusty/www/html/ccan
 
-ALL_PAGES=$(patsubst %, $(WEBDIR)/info/%.html, $(ALL))
-DIRECT_TARBALLS=$(patsubst %, $(WEBDIR)/tarballs/%.tar.bz2, $(ALL))
-DEPEND_TARBALLS=$(patsubst %, $(WEBDIR)/tarballs/with-deps/%.tar.bz2, $(ALL))
+# Ignore EXCLUDE when making webpages.
+REALLY_ALL=$(patsubst ccan/%/_info, %, $(wildcard ccan/*/_info))
+ALL_PAGES=$(patsubst %, $(WEBDIR)/info/%.html, $(REALLY_ALL))
+DIRECT_TARBALLS=$(patsubst %, $(WEBDIR)/tarballs/%.tar.bz2, $(REALLY_ALL))
+DEPEND_TARBALLS=$(patsubst %, $(WEBDIR)/tarballs/with-deps/%.tar.bz2, $(REALLY_ALL))
 WEB_SUBDIRS=$(WEBDIR)/tarballs $(WEBDIR)/junkcode $(WEBDIR)/tarballs/with-deps $(WEBDIR)/info
 JUNKDIRS=$(wildcard junkcode/*)
 JUNKPAGES=$(JUNKDIRS:%=$(WEBDIR)/%.html)
@@ -58,7 +60,7 @@ $(BZRBROWSE): $(WEBDIR)/%: web/bzrbrowse/%
 	cp $< $@
 
 $(WEBDIR)/info/%.html: $(WEBDIR)/tarballs/%.tar.bz2 $(WEBDIR)/tarballs/with-deps/%.tar.bz2
-	@URLPREFIX=../ php5 web/staticmoduleinfo.php ccan/$* > $@
+	@URLPREFIX=../ php5 web/staticmoduleinfo.php `pwd`/ccan/$* > $@
 
 $(WEBDIR)/tarballs/%.tar.bz2: ccan/%/_info
 	tar -c -j -f $@ `bzr ls --recursive --versioned --kind=file ccan/$*`
-- 
2.39.2