diff options
| author | Francisco Vila <francisco.vila@hispalinux.es> | 2012-03-07 10:23:11 +0100 |
|---|---|---|
| committer | Francisco Vila <francisco.vila@hispalinux.es> | 2012-03-07 10:23:11 +0100 |
| commit | 9d1520b21710bd22872010ae9aa4c4899014e9d4 (patch) | |
| tree | 04b303067cae8d52854ad029cbded64bc7403ce6 /stepmake | |
| parent | 744709d5ce7c67890c5c79f359f885a09cc26f27 (diff) | |
| parent | ab45be2f0dd1b5eece042934682039ec4e99b271 (diff) | |
Merge branch 'lilypond/translation' into staging
Conflicts:
Documentation/changes.tely
Documentation/translations.itexi
Documentation/web/news-front.itexi
VERSION
input/regression/layout-from.ly
lily/context-def.cc
Diffstat (limited to 'stepmake')
| -rw-r--r-- | stepmake/stepmake/texinfo-rules.make | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/stepmake/stepmake/texinfo-rules.make b/stepmake/stepmake/texinfo-rules.make index 074060627e..7b5da4a65f 100644 --- a/stepmake/stepmake/texinfo-rules.make +++ b/stepmake/stepmake/texinfo-rules.make @@ -60,10 +60,10 @@ endif ifneq ($(ISOLANG),) $(XREF_MAPS_DIR)/%.$(ISOLANG).xref-map: $(outdir)/%.texi $(XREF_MAPS_DIR)/%.xref-map - $(buildscript-dir)/extract_texi_filenames $(XREF_MAP_FLAGS) -q -o $(XREF_MAPS_DIR) --master-map-file=$(XREF_MAPS_DIR)/$*.xref-map $< + $(buildscript-dir)/extract_texi_filenames $(XREF_MAP_FLAGS) -o $(XREF_MAPS_DIR) --master-map-file=$(XREF_MAPS_DIR)/$*.xref-map $< else $(XREF_MAPS_DIR)/%.xref-map: $(outdir)/%.texi - $(buildscript-dir)/extract_texi_filenames $(XREF_MAP_FLAGS) -q -o $(XREF_MAPS_DIR) $< + $(buildscript-dir)/extract_texi_filenames $(XREF_MAP_FLAGS) -o $(XREF_MAPS_DIR) $< endif $(outdir)/%.info: %.texi $(outdir)/$(INFO_IMAGES_DIR).info-images-dir-dep $(outdir)/version.itexi $(outdir)/weblinks.itexi |