patch::: 1.3.139.jcn1

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

diff --git a/stepmake/stepmake/texinfo-rules.make b/stepmake/stepmake/texinfo-rules.make
index 42474ba6fc9255b6837b07f1659f64edf53a9244..f010dda87bf61784f96834d6a77e0a1ec4492cc4 100644 (file)
--- a/stepmake/stepmake/texinfo-rules.make
+++ b/stepmake/stepmake/texinfo-rules.make
@@ -3,23 +3,29 @@
 .SUFFIXES: .html .info .texi .texinfo
 
 $(outdir)/%.info: $(outdir)/%.texi
-       makeinfo --output=$@ $<
+       $(MAKEINFO) -I $(outdir) --output=$@ $<
 
-$(outdir)/%.html:      $(outdir)/%.texi
-       -makeinfo --force --output=$@ --html --no-headers $< 
+$(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) $@
 
-$(outdir)/%.dvi:       $(outdir)/%.texi
-# --clean only in >= 3.12s
-# cd $(outdir); texi2dvi --clean ../$< 
-       cd $(outdir); texi2dvi ../$< 
+# 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))
+
+$(outdir)/%.dvi: $(outdir)/%.texi
+       cd $(outdir); texi2dvi --batch $(<F)
 
 $(outdir)/%.txt: $(outdir)/%.texi
-       $(MAKEINFO) -I../  --no-split --no-headers --output $@ $<
+       $(MAKEINFO) -I $(pwd) -I $(outdir) --no-split --no-headers --output $@ $<
 
 $(outdir)/%.texi: %.texi
+       rm -f $@
        cp $< $@
+       chmod -w $@