From 85f59ac144094b7f61c10cda8987200daf189cdb Mon Sep 17 00:00:00 2001
From: Graham Percival <graham@percival-music.ca>
Date: Wed, 23 Dec 2009 19:01:37 +0000
Subject: [PATCH] Web build: build upload dir.

Currently we still need to get out-www/pictures, but the rest is
all there.
---
 Documentation/GNUmakefile | 9 +++++++++
 GNUmakefile.in            | 6 ++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index 24bd9663cb..7fdb79671f 100644
--- a/Documentation/GNUmakefile
+++ b/Documentation/GNUmakefile
@@ -97,6 +97,15 @@ OUT_TXT_FILES = $(addprefix $(outdir)/, $(addsuffix .txt, $(README_TOP_FILES)))
 ### Web site idiosyncrases
 $(XREF_MAPS_DIR)/web.xref-map: XREF_MAP_FLAGS += --split=node
 
+ifeq ($(out),www)
+website: $(outdir)/web.texi
+	mkdir -p $(outdir)/upload/
+	$(TEXI2HTML) $(TEXI2HTML_SPLIT) $(TEXI2HTML_FLAGS) -D web_version \
+		--output=$(outdir)/upload/ $(outdir)/web.texi
+	cp $(top-src-dir)/Documentation/css/*.css $(outdir)/upload/
+	#cd out-website && ln -sf ../$(outdir)/pictures pictures
+endif
+
 
 ### bad hack for badly-integrated roadmap.
 $(outdir)/ROADMAP:
diff --git a/GNUmakefile.in b/GNUmakefile.in
index ad94e6a1f3..8e590cdb4e 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -242,10 +242,8 @@ grand-replace:
 
 ################################################################
 # website (without the rest of the docs)
-web-version:
-	touch $(top-src-dir)/Documentation/web.texi
-	cd $(top-build-dir)/Documentation && make out=www WEB_VERSION=yes out-www/web/index.html
-
+website:
+	$(MAKE) out=www -C Documentation website
 
 ################################################################
 # testing
-- 
2.39.2