X-Git-Url: https://git.distorted.org.uk/~mdw/mdwfonts/blobdiff_plain/6ec4764f54f6bede8252592d4281719f994bca47..90e765f9d2385a218e9d793741ad6184aba9ebeb:/Makefile.m4

diff --git a/Makefile.m4 b/Makefile.m4
index f547ecb..4bf66da 100644
--- 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,27 +64,35 @@ 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) $(FD)
+.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 = \
 	$(SRC) $(AUX) $(INS) $(ETX) $(FD) $(TFM) $(VF) $(PL) $(VPL) $(DVI) \
-	$(MAP) \
+	$(MAP) $(PS) $(PDF) \
+	zrhax.mtx zrmhax.mtx \
 	mdwfonts.ins Makefile.m4
 
 MAINTAINERCLEANFILES = $(INS) $(ETX) $(TFM) $(VF) $(DVI) *.fd
@@ -99,6 +107,12 @@ dist-hook::
 	echo $(VERSION) >$(distdir)/RELEASE
 EXTRA_DIST += auto-version
 
+EXTRA_DIST += debian/changelog debian/control debian/copyright debian/compat
+EXTRA_DIST += debian/rules
+
+EXTRA_DIST += debian/mdwfonts.install
+EXTRA_DIST += debian/mdwfonts.docs debian/mdwfonts.maps
+
 .PHONY: dvi
 
 ##----- That's all, folks ---------------------------------------------------