Docs: fix OMF stuff

diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index a8f48021301b61fe00e90a9fa6b6c2b699ad84d3..3953c1136f23a150a78e4b91d81c4e689ebaf781 100644 (file)
--- a/Documentation/GNUmakefile
+++ b/Documentation/GNUmakefile
@@ -122,7 +122,7 @@ local-clean:
 ifeq ($(out),www)
 local-WWW-1: $(TEXINFO_MANUALS:%=$(outdir)/%.texi) $(PDF_FILES) info
 
-local-WWW-2: txt-to-html $(OUT_HTML_FILES) $(DEEP_HTML_FILES) $(source-links)
+local-WWW-2: txt-to-html $(OUT_HTML_FILES) $(DEEP_HTML_FILES) $(source-links) $(OMF_FILES)
 endif
 
 

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 67a72886da1dab79bdcd43d73ffb6860fb6d67f9..123684cabda18df890a7a287337cd8badbe8f51a 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -101,6 +101,7 @@ ifeq ($(out),www)
 install-WWW:
        -$(INSTALL) -m 755 -d $(DESTDIR)$(webdir)
        rsync -rl --exclude='*.signature' $(outdir)/offline-root/ $(DESTDIR)$(webdir)
+       $(MAKE) -C Documentation omf-local-install
 
 install-info-WWW:
        $(foreach d, $(INFO_DIRECTORIES),$(MAKE) -C $(d) install-info && ) true

diff --git a/stepmake/stepmake/omf-targets.make b/stepmake/stepmake/omf-targets.make
index 2a51b1bd58ec9fdc1e0075c68231cbd277ef5110..49325215e67afaaa2045a2b8da9d7608aa0910f6 100644 (file)
--- a/stepmake/stepmake/omf-targets.make
+++ b/stepmake/stepmake/omf-targets.make
@@ -1,14 +1,14 @@
 
 omf: $(OMF_FILES)
 
-local-install: omf-local-install
-
 omf-local-install: $(OMF_FILES)
        -$(INSTALLPY) -d $(DESTDIR)$(local_package_omfdir)
        $(foreach a, $(OMF_FILES), $(INSTALLPY) -m 644 $(a) $(DESTDIR)$(local_package_omfdir)/$(notdir $(a)) && ) true
        @echo "Run scrollkeeper-update to register newly installed OMF files."
 
+ifeq ($(out),www)
 local-uninstall: omf-local-uninstall
+endif
 
 omf-local-uninstall:
        rm -f $(foreach i, $(OMF_FILES), $(DESTDIR)$(local_package_omfdir)/$(notdir $(i)))

diff --git a/stepmake/stepmake/texinfo-vars.make b/stepmake/stepmake/texinfo-vars.make
index c144370d1b1d05fef32017fb53556f7389c63125..1db4b06ef598d39e398b84fa961400712a4edffb 100644 (file)
--- a/stepmake/stepmake/texinfo-vars.make
+++ b/stepmake/stepmake/texinfo-vars.make
@@ -6,7 +6,7 @@ OUTTXT_FILES += $(addprefix $(outdir)/,$(TEXI_FILES:.texi=.txt))
 
 OMF_FILES += $(foreach format, html pdf, $(foreach f, $(TEXI_FILES), $(outdir)/$(f:.texi=.$(format)).omf))
 
-GENERATE_OMF = $(buildscript-dir)/texi2omf --format $(1) --location $(webdir)/$(tree-dir)/out-www/$(notdir $(basename $@))  --version $(TOPLEVEL_VERSION) $< > $@
+GENERATE_OMF = $(buildscript-dir)/texi2omf --format $(1) --location $(webdir)$(tree-dir)/$(notdir $(basename $@))  --version $(TOPLEVEL_VERSION) $< > $@
 
 TEXINFO_PAPERSIZE_OPTION= $(if $(findstring $(PAPERSIZE),a4),,-t @afourpaper)