More makefiles fixes

* add new generic variable abs-src-dir, which makes the absolute
current source directory available even in builds without --srcdir;

* use abs-src-dir instead of hard-coded directory in metafont rules;

* add -I$(abs-src-dir) in texi2pdf call;

* fix Contributors' Guide makefile.

diff --git a/Documentation/devel/GNUmakefile b/Documentation/devel/GNUmakefile
index 5c10ebef9ce1050b59db011bf226c8926e09a565..526b6f163bc8bcb873a27013c1b9170473a04e41 100644 (file)
--- a/Documentation/devel/GNUmakefile
+++ b/Documentation/devel/GNUmakefile
@@ -19,3 +19,5 @@ default: local-doc
 local-WWW-1: $(PDF_FILES)
 
 local-WWW-2: $(HTML_FILES) $(OUT_HTML_FILES)
+
+$(PDF_FILES) $(HTML_FILES): $(ITEXI_FILES)

diff --git a/stepmake/stepmake/generic-vars.make b/stepmake/stepmake/generic-vars.make
index 834a527409384fbc542e81f76f10f93254905297..31c81d20180ddb27c6c74c7dcf71003c45389d45 100644 (file)
--- a/stepmake/stepmake/generic-vars.make
+++ b/stepmake/stepmake/generic-vars.make
@@ -24,6 +24,8 @@ src-dir = $(top-src-dir)$(tree-dir)
 VPATH = $(src-dir)
 endif
 
+abs-src-dir = $(top-src-dir)$(tree-dir)
+
 .UNEXPORT: build-dir src-dir tree-dir
 
 src-wildcard = $(subst $(src-dir)/,,$(wildcard $(src-dir)/$(1)))

diff --git a/stepmake/stepmake/metafont-rules.make b/stepmake/stepmake/metafont-rules.make
index ab28ced9a5f3d8f0319580acb309d0012662d914..3a7b158aead63d394491bc66adf6813a6d6dee5e 100644 (file)
--- a/stepmake/stepmake/metafont-rules.make
+++ b/stepmake/stepmake/metafont-rules.make
@@ -19,7 +19,7 @@ $(outdir)/%.pfb: %.mf $(outdir)/mf2pt1.mem
        TMP=`mktemp -d $(outdir)/pfbtemp.XXXXXXXXX` \
        && ( cd $$TMP \
                && ln -s ../mf2pt1.mem . \
-               && MFINPUTS=$(top-src-dir)/mf:..:: $(buildscript-dir)/mf2pt1 $(MF2PT1_OPTIONS) $< $(METAFONT_QUIET)) \
+               && MFINPUTS=$(abs-src-dir):..:: $(buildscript-dir)/mf2pt1 $(MF2PT1_OPTIONS) $< $(METAFONT_QUIET)) \
        && mv $$TMP/*pfb $(outdir); \
        rm -rf $$TMP
 

diff --git a/stepmake/stepmake/texinfo-rules.make b/stepmake/stepmake/texinfo-rules.make
index 5ebef89c3e6431c05caee7021dd32714416bffee..4722b0a9d09e3d7a970ca490f210b2b538400af8 100644 (file)
--- a/stepmake/stepmake/texinfo-rules.make
+++ b/stepmake/stepmake/texinfo-rules.make
@@ -62,8 +62,7 @@ $(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 $@ $<