From: John Mandereau <john.mandereau@gmail.com>
Date: Fri, 21 Aug 2009 22:38:07 +0000 (+0200)
Subject: Docs: restore xref-maps, and restore PDF for translations that support it
X-Git-Tag: release/2.13.4-1~170
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=c570e7303fd918e21bca0edd957ae2e7805ddd1c;p=lilypond.git

Docs: restore xref-maps, and restore PDF for translations that support it
---

diff --git a/Documentation/ja/GNUmakefile b/Documentation/ja/GNUmakefile
index d0a75fa12a..4d8e9e25c6 100644
--- a/Documentation/ja/GNUmakefile
+++ b/Documentation/ja/GNUmakefile
@@ -3,5 +3,6 @@ depth = ../..
 SUBDIRS = application learning texidocs
 STEPMAKE_TEMPLATES = documentation
 LOCALSTEPMAKE_TEMPLATES = lilypond ly doc-i18n-root
+NO_PDF_FILES = 1
 
 include $(depth)/make/stepmake.make
diff --git a/Documentation/nl/GNUmakefile b/Documentation/nl/GNUmakefile
index d241809086..c569372035 100644
--- a/Documentation/nl/GNUmakefile
+++ b/Documentation/nl/GNUmakefile
@@ -3,5 +3,6 @@ depth = ../..
 SUBDIRS = application general learning notation texidocs
 STEPMAKE_TEMPLATES = documentation
 LOCALSTEPMAKE_TEMPLATES = lilypond ly doc-i18n-root
+NO_PDF_FILES = 1
 
 include $(depth)/make/stepmake.make
diff --git a/make/doc-i18n-root-targets.make b/make/doc-i18n-root-targets.make
index 64c00b0348..dc91d0e169 100644
--- a/make/doc-i18n-root-targets.make
+++ b/make/doc-i18n-root-targets.make
@@ -1,10 +1,10 @@
 default:
 
 ifeq ($(out),www)
-ifeq ($(ISOLANG),ja)
+ifneq ($(N0_PDF_FILES),)
 local-WWW-1: $(MASTER_TEXI_FILES) $(XREF_MAPS_FILES)
 endif
-ifneq ($(ISOLANG),ja)
+ifeq ($(NO_PDF_FILES),)
 local-WWW-1: $(MASTER_TEXI_FILES) $(PDF_FILES) $(XREF_MAPS_FILES)
 endif
 
diff --git a/make/doc-i18n-root-vars.make b/make/doc-i18n-root-vars.make
index 8da06ada19..130c14b095 100644
--- a/make/doc-i18n-root-vars.make
+++ b/make/doc-i18n-root-vars.make
@@ -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)
 
diff --git a/stepmake/stepmake/texinfo-rules.make b/stepmake/stepmake/texinfo-rules.make
index ce6c647792..808c89f87d 100644
--- a/stepmake/stepmake/texinfo-rules.make
+++ b/stepmake/stepmake/texinfo-rules.make
@@ -42,7 +42,6 @@ $(outdir)/%/index.html: $(outdir)/%.texi $(XREF_MAPS_DIR)/%.xref-map $(outdir)/v
 
 $(XREF_MAPS_DIR)/%.xref-map: $(outdir)/%.texi
 	$(buildscript-dir)/extract_texi_filenames $(XREF_MAP_FLAGS) -o $(XREF_MAPS_DIR) $<
-	touch -r $< $@
 
 $(outdir)/%.info: %.texi $(outdir)/$(INFO_IMAGES_DIR).info-images-dir-dep $(outdir)/version.itexi
 	$(MAKEINFO) -I$(src-dir) -I$(outdir) --output=$@ $<
diff --git a/stepmake/stepmake/texinfo-vars.make b/stepmake/stepmake/texinfo-vars.make
index 90b985069e..e5b2e98125 100644
--- a/stepmake/stepmake/texinfo-vars.make
+++ b/stepmake/stepmake/texinfo-vars.make
@@ -17,7 +17,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 += $(TEXI_FILES:%.texi=$(XREF_MAPS_DIR)/%.xref-map) \
  $(TELY_FILES:%.tely=$(XREF_MAPS_DIR)/%.xref-map)
 XREF_MAP_FLAGS += -I $(outdir)