Makefile.m4: Fix rules to be parallel-make safe.

[mdwfonts] / Makefile.m4

diff --git a/Makefile.m4 b/Makefile.m4
index 8190f21..e3db7b3 100644 (file)
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -30,7 +30,7 @@ pkgdocdir = ${texmfdir}/doc/latex/${PACKAGE}
 pkgtfmdir = ${texmfdir}/fonts/tfm/${PACKAGE}
 pkgvfdir = ${texmfdir}/fonts/vf/${PACKAGE}
 pkgetxdir = ${texmfdir}/tex/fontinst/${PACKAGE}
-pkmapdir = ${texmfdir}/dvips/${PACKAGE}
+pkmapdir = ${texmfdir}/fonts/map/${PACKAGE}
 
 FONTINST = @FONTINST@
 
@@ -64,22 +64,29 @@ pkgetx_DATA = $(ETX)
 pkmap_DATA = $(MAP)
 
 SUFFIXES = .dtx .dvi .vf .tfm .pl .vpl .ps .pdf
-define(`run_latex', `latex "\def\indexing{n} \nonstopmode \input $<"
-       latex "\def\indexing{y} \nonstopmode \input $<"
-       makeindex -s gind.ist $`'*.idx
-       latex "\def\indexing{n} \nonstopmode \input $<"')
-
-$(DVI): $(AUX) $(INS)
-.dtx.dvi: run_latex
+define(`run_latex', `rm -rf t.$`'@/ && mkdir t.$`'@/ && \
+       cd t.$`'@/ && \
+       TEXINPUTS=..:$$TEXINPUTS && export TEXINPUTS && \
+       $1 "\def\indexing{n} \nonstopmode \input $<" && \
+       $1 "\def\indexing{y} \nonstopmode \input $<" && \
+       makeindex -s gind.ist $`'*.idx && \
+       $1 "\def\indexing{n} \nonstopmode \input $<" && \
+       mv $`'@ ../ && cd ../ && rm -rf t.$`'@/')
+
+$(DVI) $(PDF): $(AUX) $(INS)
+.dtx.dvi:; run_latex(`latex')
+.dtx.pdf:; run_latex(`pdflatex')
 .dvi.ps:; dvips $<
-.ps.pdf:; ps2pdf $< $@
 .vpl.tfm:; vptovf $<
 .pl.tfm:; pltotf $<
 .vpl.vf:; vptovf $<
+clean-local::; rm -rf t.*/
 
-$(ETX) $(MAP) $(INS): $(SRC) mdwfonts.ins
+$(wordlist 2,$(words $(ETX)),$(ETX)) $(MAP) $(INS): $(firstword $(ETX))
+$(firstword $(ETX)): $(SRC) mdwfonts.ins
        tex "\nonstopmode \input mdwfonts.ins"
-$(FD) $(VF) $(PL) $(VPL): mdwfonts.tex $(ETX)
+$(wordlist 2,$(words $(FD)),$(FD)) $(VF) $(PL) $(VPL): $(firstword $(FD))
+$(firstword $(FD)): mdwfonts.tex $(ETX)
        $(FONTINST) "\nonstopmode \input mdwfonts.tex"
 
 EXTRA_DIST = \