From: John Mandereau <john.mandereau@gmail.com>
Date: Sun, 26 Jul 2009 18:38:08 +0000 (+0200)
Subject: Docs: fix OMF stuff
X-Git-Tag: release/2.13.4-1~286
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=ef218f9a284968d7e23559869e138bb62cc18fd4;p=lilypond.git

Docs: fix OMF stuff
---

diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index a8f4802130..3953c1136f 100644
--- 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 67a72886da..123684cabd 100644
--- 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 2a51b1bd58..49325215e6 100644
--- 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 c144370d1b..1db4b06ef5 100644
--- 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)