Eliminate unix-specific -u flags from internationalization build

[lilypond.git] / make / doc-i18n-user-rules.make

diff --git a/make/doc-i18n-user-rules.make b/make/doc-i18n-user-rules.make
index 66a97cc22874b2ac12b126d852838ba4eaa07bc1..30ef6bd70fbbe78bf28283c8888b6b1f9bf21c8d 100644 (file)
--- a/make/doc-i18n-user-rules.make
+++ b/make/doc-i18n-user-rules.make
@@ -1,23 +1,14 @@
-ifeq (,$(findstring texi2html,$(MISSING_OPTIONAL)))
-$(outdir)/%/index.html: $(outdir)/%.texi $(XREF_MAPS_DIR)/%.$(ISOLANG).xref-map $(OUT_PNG_IMAGES)
+$(outdir)/%/index.html: $(outdir)/%.texi $(XREF_MAPS_DIR)/%.$(ISOLANG).xref-map $(OUT_PNG_IMAGES) $(CSS_SOURCE_FILES)
        mkdir -p $(dir $@)
        $(TEXI2HTML) --I=$(src-dir) --I=$(outdir) $(TEXI2HTML_FLAGS) --output=$(dir $@) --prefix=index --split=section $(TEXI2HTML_INIT) $<
-       cp $(top-src-dir)/Documentation/lilypond*.css $(dir $@)
+       cp  $(CSS_SOURCE_FILES) $(dir $@)
 
-$(outdir)/%-big-page.html: $(outdir)/%.texi $(XREF_MAPS_DIR)/%.$(ISOLANG).xref-map $(OUT_PNG_IMAGES)
+$(outdir)/%-big-page.html: $(outdir)/%.texi $(XREF_MAPS_DIR)/%.$(ISOLANG).xref-map $(OUT_PNG_IMAGES) $(CSS_SOURCE_FILES)
        $(TEXI2HTML) --I=$(src-dir) --I=$(outdir) -D bigpage $(TEXI2HTML_FLAGS) --output=$@ $(TEXI2HTML_INIT) $<
-       cp $(top-src-dir)/Documentation/lilypond*.css $(dir $@)
-else # Rules using makeinfo follow
-$(outdir)/%/index.html: $(outdir)/%.texi
-       mkdir -p $(dir $@)
-       $(MAKEINFO) -I$(src-dir) -I$(outdir) -P $(outdir) --output=$(outdir)/$* --css-include=$(top-src-dir)/Documentation/texinfo.css --html $<
-
-$(outdir)/%-big-page.html: $(outdir)/%.texi
-       $(MAKEINFO) -I$(src-dir) -I$(outdir) -P $(outdir) --output=$@ --css-include=$(top-src-dir)/Documentation/texinfo.css --html --no-split --no-headers $< 
-endif
+       cp  $(CSS_SOURCE_FILES) $(dir $@)
 
 $(outdir)/%.pdftexi: $(outdir)/%.texi
-       $(PYTHON) $(buildscript-dir)/texi-gettext.py $(ISOLANG) $<
+       $(buildscript-dir)/texi-gettext $(ISOLANG) $<
 
 $(outdir)/%.pdf: $(outdir)/%.pdftexi
        cd $(outdir); texi2pdf $(TEXI2PDF_FLAGS) $(TEXINFO_PAPERSIZE_OPTION) $(notdir $*).pdftexi
@@ -31,7 +22,7 @@ $(outdir)/%.png: $(top-build-dir)/Documentation/user/$(outdir)/%.png
        ln -f $< $@
 
 $(XREF_MAPS_DIR)/%.$(ISOLANG).xref-map: $(outdir)/%.texi
-       $(PYTHON) $(buildscript-dir)/extract_texi_filenames.py -o $(XREF_MAPS_DIR) $<
+       $(buildscript-dir)/extract_texi_filenames -o $(XREF_MAPS_DIR) $<
 
 $(MASTER_TEXI_FILES): $(ITELY_FILES) $(ITEXI_FILES)