Merge branch 'master' into lilypond/translation

[lilypond.git] / make / doc-i18n-root-vars.make

diff --git a/make/doc-i18n-root-vars.make b/make/doc-i18n-root-vars.make
index 602351cb98d63de1f29f4786e48e364c9bbdf69a..cf11075ba8b9de463d24acfcaa27d7327cc20ffa 100644 (file)
--- a/make/doc-i18n-root-vars.make
+++ b/make/doc-i18n-root-vars.make
@@ -1,4 +1,4 @@
-HTML_PAGE_NAMES = index translations
+HTML_PAGE_NAMES = translations
 HTML_FILES = $(HTML_PAGE_NAMES:%=%.html)
 OUT_HTML_FILES = $(HTML_PAGE_NAMES:%=$(outdir)/%.html)
 
@@ -22,7 +22,7 @@ SPLITTED_HTML_MANUALS = $(foreach manual, $(TEXINFO_MANUALS),\
 OUT_HTML_FILES += $(UNSPLITTED_HTML_MANUALS:%=$(top-build-dir)/Documentation/$(outdir)/%.$(ISOLANG).html)
 BIG_PAGE_HTML_FILES := $(SPLITTED_HTML_MANUALS:%=$(top-build-dir)/Documentation/$(outdir)/%-big-page.$(ISOLANG).html)
 DEEP_HTML_FILES := $(SPLITTED_HTML_MANUALS:%=$(top-build-dir)/Documentation/$(outdir)/%/index.$(ISOLANG).html)
-#PDF_FILES := $(TEXINFO_MANUALS:%=$(top-build-dir)/Documentation/$(outdir)/%.$(ISOLANG).pdf)
+PDF_FILES := $(TELY_FILES:%.tely=$(top-build-dir)/Documentation/$(outdir)/%.$(ISOLANG).pdf)
 
 ITELY_FILES := $(call src-wildcard,*.itely)
 ITEXI_FILES := $(call src-wildcard,*.itexi)
@@ -37,7 +37,7 @@ MAKEINFO = LANG= $(MAKEINFO_PROGRAM) $(MAKEINFO_FLAGS)
 
 # texi2html xref map files
 # FIXME: duplicated in stepake/texinfo-vars.make make/doc-i18n-root-vars.make
-XREF_MAPS_DIR=$(top-build-dir)/$(outbase)/xref-maps
+XREF_MAPS_DIR=$(top-build-dir)/$(outdir)/xref-maps
 XREF_MAPS_FILES=$(TEXINFO_MANUALS:%=$(XREF_MAPS_DIR)/%.$(ISOLANG).xref-map)
 XREF_MAP_FLAGS += -I $(outdir)
 
@@ -56,14 +56,14 @@ DOC_TEXI2HTML_SPLIT = --prefix=index --split=section
 WEB_TEXI2HTML_SPLIT = --prefix=index --split=node --node-files
 TEXI2HTML_SPLIT = $(DOC_TEXI2HTML_SPLIT)
 
-$(top-build-dir)/Documentation/$(outdir)/general/index.$(ISOLANG).html:\
+$(top-build-dir)/Documentation/$(outdir)/index.$(ISOLANG).html:\
        TEXI2HTML_INIT = $(WEB_TEXI2HTML_INIT)
-$(top-build-dir)/Documentation/$(outdir)/general/index.$(ISOLANG).html:\
+$(top-build-dir)/Documentation/$(outdir)/index.$(ISOLANG).html:\
        TEXI2HTML_SPLIT := $(WEB_TEXI2HTML_SPLIT)
 
 TEXI2HTML_INCLUDES += --I=. --I=$(src-dir) --I=$(outdir) $(DOCUMENTATION_INCLUDES) --I=$(XREF_MAPS_DIR)
 TEXI2HTML_FLAGS += $(TEXI2HTML_INCLUDES) $(TEXI2HTML_INIT) $(TEXI2HTML_LANG)
-TEXI2HTML = PERL_UNICODE=SD $(TEXI2HTML_PROGRAM)
+TEXI2HTML = SRC_DIR=$(src-dir) PERL_UNICODE=SD $(TEXI2HTML_PROGRAM)
 ###########
 
 TEXI2PDF_FLAGS += --batch $(DOCUMENTATION_INCLUDES)