Merge branch 'master' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond into lilypond...

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

diff --git a/stepmake/stepmake/texinfo-rules.make b/stepmake/stepmake/texinfo-rules.make
index 05627f18dab6eb598cd0fab9c76fc546fc93ac54..4722b0a9d09e3d7a970ca490f210b2b538400af8 100644 (file)
--- a/stepmake/stepmake/texinfo-rules.make
+++ b/stepmake/stepmake/texinfo-rules.make
@@ -62,18 +62,16 @@ $(outdir)/%.ps.gz.omf: %.texi
        $(call GENERATE_OMF,ps.gz)
 
 $(outdir)/%.pdf: $(outdir)/%.texi $(outdir)/version.itexi
-       cd $(outdir); texi2pdf $(TEXI2PDF_FLAGS) --batch $(TEXINFO_PAPERSIZE_OPTION) $(<F)
+       cd $(outdir); texi2pdf $(TEXI2PDF_FLAGS) -I $(abs-src-dir) --batch $(TEXINFO_PAPERSIZE_OPTION) $(<F)
 
 $(outdir)/%.txt: $(outdir)/%.texi $(outdir)/version.itexi
        $(MAKEINFO) -I$(src-dir) -I$(outdir) --no-split --no-headers --output $@ $<
 
-$(outdir)/%.texi: %.texi
-       rm -f $@
-       cp $< $@
-
 $(XREF_MAPS_DIR)/%.xref-map: $(outdir)/%.texi
        $(buildscript-dir)/extract_texi_filenames -o $(XREF_MAPS_DIR) $<
 
+$(outdir)/%.texi: %.texi
+       cp -f $< $@
 
 $(outdir)/version.%: $(top-src-dir)/VERSION
        echo '@macro version'> $@
@@ -81,4 +79,5 @@ $(outdir)/version.%: $(top-src-dir)/VERSION
        echo '@end macro'>> $@
 
 .SECONDARY: $(outdir)/version.itexi $(outdir)/version.texi \
-  $(outdir)/$(INFO_IMAGES_DIR).info-images-dir-dep
+  $(outdir)/$(INFO_IMAGES_DIR).info-images-dir-dep \
+  $(outdir)/*.texi