Web build: build upload dir.

Currently we still need to get out-www/pictures, but the rest is
all there.

diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index 24bd9663cb7d75b4dad47f76356e5d6307e099e9..7fdb79671f58b64ee91db17b7befab764e238348 100644 (file)
--- 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 ad94e6a1f30eb8a96ccbc2c8966e565a27506bd4..8e590cdb4e7b63710bcdfd2da575b2f7bb5188af 100644 (file)
--- 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