From 3fd858f7bc65da06c4d24b20afab2267d98aa41e Mon Sep 17 00:00:00 2001 From: Graham Percival Date: Sat, 19 Dec 2009 15:31:21 +0000 Subject: [PATCH] Web build: add special target for online website. --- Documentation/web.texi | 4 ++++ GNUmakefile.in | 6 +++--- stepmake/stepmake/texinfo-rules.make | 16 ++++++++++++++++ 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/Documentation/web.texi b/Documentation/web.texi index 417b0ab988..aaac6c5413 100644 --- a/Documentation/web.texi +++ b/Documentation/web.texi @@ -16,6 +16,10 @@ @set web @include macros.itexi +@ifset web_version +foo foo foo foo foo foo foo foo foo foo foo foo foo foo foo foo foo +@end ifset + @afourpaper @c don't remove this comment. diff --git a/GNUmakefile.in b/GNUmakefile.in index 2538c22cba..2860088095 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -243,9 +243,9 @@ grand-replace: ################################################################ # website (without the rest of the docs) -web-gop: - touch Documentation/web.texi - cd Documentation && make out=www out-www/web/index.html +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 ################################################################ diff --git a/stepmake/stepmake/texinfo-rules.make b/stepmake/stepmake/texinfo-rules.make index 6be8c5f078..b9f379acec 100644 --- a/stepmake/stepmake/texinfo-rules.make +++ b/stepmake/stepmake/texinfo-rules.make @@ -27,17 +27,29 @@ $(outdir)/%.texi: $(src-dir)/%.texi cp -p $< $@ $(outdir)/%.info: $(outdir)/%.texi $(outdir)/$(INFO_IMAGES_DIR).info-images-dir-dep $(outdir)/version.itexi +ifeq ($(WEB_VERSION),yes) + $(MAKEINFO) -I$(src-dir) -I$(outdir) -D web_version --output=$@ $< +else $(MAKEINFO) -I$(src-dir) -I$(outdir) --output=$@ $< +endif $(outdir)/%-big-page.html: $(outdir)/%.texi $(XREF_MAPS_DIR)/%.xref-map $(outdir)/version.itexi +ifeq ($(WEB_VERSION),yes) + $(TEXI2HTML) $(TEXI2HTML_FLAGS) -D bigpage -D web_version --output=$@ $< +else $(TEXI2HTML) $(TEXI2HTML_FLAGS) -D bigpage --output=$@ $< +endif $(outdir)/%.html: $(outdir)/%.texi $(XREF_MAPS_DIR)/%.xref-map $(outdir)/version.itexi $(TEXI2HTML) $(TEXI2HTML_FLAGS) --output=$@ $< $(outdir)/%/index.html: $(outdir)/%.texi $(XREF_MAPS_DIR)/%.xref-map $(outdir)/version.itexi $(outdir)/%.html.omf mkdir -p $(dir $@) +ifeq ($(WEB_VERSION),yes) + $(TEXI2HTML) $(TEXI2HTML_SPLIT) $(TEXI2HTML_FLAGS) -D web_version --output=$(dir $@) $< +else $(TEXI2HTML) $(TEXI2HTML_SPLIT) $(TEXI2HTML_FLAGS) --output=$(dir $@) $< +endif cp $(top-src-dir)/Documentation/css/*.css $(dir $@) $(XREF_MAPS_DIR)/%.xref-map: $(outdir)/%.texi @@ -47,7 +59,11 @@ $(outdir)/%.info: %.texi $(outdir)/$(INFO_IMAGES_DIR).info-images-dir-dep $(outd $(MAKEINFO) -I$(src-dir) -I$(outdir) --output=$@ $< $(outdir)/%.pdf: $(outdir)/%.texi $(outdir)/version.itexi $(outdir)/%.pdf.omf +ifeq ($(WEB_VERSION),yes) + cd $(outdir); texi2pdf $(TEXI2PDF_FLAGS) -D web_version -I $(abs-src-dir) --batch $(TEXINFO_PAPERSIZE_OPTION) $(