Smarter dotted version hunting.

[lilypond.git] / stepmake / stepmake / texinfo-rules.make

diff --git a/stepmake/stepmake/texinfo-rules.make b/stepmake/stepmake/texinfo-rules.make
index 5cfa7f8253182d77223435d56257b97075970491..5cf8c2d011b254f588a2369cfc685fd6f956ee84 100644 (file)
--- a/stepmake/stepmake/texinfo-rules.make
+++ b/stepmake/stepmake/texinfo-rules.make
@@ -5,35 +5,30 @@ $(outdir)/%.info: $(outdir)/%.texi
        $(MAKEINFO) -I $(outdir) --output=$@ $<
 
 $(outdir)/%.html: $(outdir)/%.texi
-       $(MAKEINFO) -I $(outdir) --output=$@ --html --no-split --no-headers $<
-# we want footers even if website builds (or is built) partly
-       $(footify) $@
+       $(MAKEINFO) -I $(outdir) --output=$@ --css-include=$(top-src-dir)/Documentation/texinfo.css --html --no-split --no-headers $<
 
+$(outdir)/%.html.omf: %.texi
+       $(call GENERATE_OMF,html)
 
-$(outdir)/%.html.omf: $(outdir)/%.texi
-       $(GENERATE_OMF) --format html --location $(local_package_docdir)/$(current-relative-dir)/out-www/$(notdir $(basename $@))  --version $(TOPLEVEL_VERSION) $< > $@
-$(outdir)/%.pdf.omf: $(outdir)/%.texi
-       $(GENERATE_OMF) --format pdf --location $(local_package_docdir)/$(current-relative-dir)/out-www/$(notdir $(basename $@))  --version $(TOPLEVEL_VERSION) $< > $@
+$(outdir)/%.pdf.omf: %.texi
+       $(call GENERATE_OMF,pdf)
 
-$(outdir)/%.ps.gz.omf: $(outdir)/%.texi
-       $(GENERATE_OMF) --format ps.gz --location $(local_package_docdir)/$(current-relative-dir)/out-www/$(notdir $(basename $@))  --version $(TOPLEVEL_VERSION) $< > $@
+$(outdir)/%.ps.gz.omf: %.texi
+       $(call GENERATE_OMF,ps.gz)
 
 # Generic rule not possible?
 $(outdir)/%/%.html: $(outdir)/%.texi
-       $(MAKEINFO) --output=$@ --html $<
-# we want footers even if website builds (or is built) partly
-       $(deep-footify) $(sort $(wildcard $(outdir)/$(*F)/*.html))
+       $(MAKEINFO) --output=$@ --css-include=$(top-src-dir)/Documentation/texinfo.css --html $<
 
-$(outdir)/%.dvi: $(outdir)/%.texi
-       cd $(outdir); texi2dvi --batch $(<F)
+$(outdir)/%.pdf: $(outdir)/%.texi
+       cd $(outdir); texi2pdf $(TEXI2PDF_FLAGS) --batch $(TEXINFO_PAPERSIZE_OPTION) $(<F)
 
 $(outdir)/%.txt: $(outdir)/%.texi
-       $(MAKEINFO) -I $(pwd) -I $(outdir) --no-split --no-headers --output $@ $<
+       $(MAKEINFO) -I $(src-dir) -I $(outdir) --no-split --no-headers --output $@ $<
 
 $(outdir)/%.texi: %.texi
        rm -f $@
        cp $< $@
-       chmod -w $@