patch::: 1.5.9.jcn3

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

diff --git a/stepmake/stepmake/texinfo-rules.make b/stepmake/stepmake/texinfo-rules.make
index 452f736b1fe231ee38db82c141e67d25119adc2f..663c89bcdb182c58ef176c42592ce3824534f90a 100644 (file)
--- a/stepmake/stepmake/texinfo-rules.make
+++ b/stepmake/stepmake/texinfo-rules.make
@@ -1,28 +1,25 @@
-# Texinfo_rules.make
 
 .SUFFIXES: .html .info .texi .texinfo
 
 $(outdir)/%.info: $(outdir)/%.texi
-       -$(MAKEINFO) --force -I $(outdir) --output=$@ $<
+       $(MAKEINFO) -I $(outdir) --output=$@ $<
 
 $(outdir)/%.html: $(outdir)/%.texi
-       -$(MAKEINFO) --force -I $(outdir) --output=$@ --html --no-split --no-headers $<
+       $(MAKEINFO) -I $(outdir) --output=$@ --html --no-split --no-headers $<
 # we want footers even if website builds (or is built) partly
        $(footify) $@
 
 # Generic rule not possible?
 $(outdir)/%/%.html: $(outdir)/%.texi
-       -$(MAKEINFO) --force --output=$@ --html $<
+       $(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
-# ugh, --clean removes .. from TEXINPUTS?
-#      cd $(outdir); texi2dvi --batch --clean ../$< 
-       cd $(outdir); texi2dvi --batch ../$< 
+       cd $(outdir); texi2dvi --batch $(<F)
 
 $(outdir)/%.txt: $(outdir)/%.texi
-       $(MAKEINFO) -I../ -I $(outdir) --no-split --no-headers --output $@ $<
+       $(MAKEINFO) -I $(pwd) -I $(outdir) --no-split --no-headers --output $@ $<
 
 $(outdir)/%.texi: %.texi
        rm -f $@