X-Git-Url: https://git.distorted.org.uk/~mdw/mdwfonts/blobdiff_plain/c369c819fbc369d27c8b7772174a901247b56b3f..1b932a9b4942ce95feb21f212dd91c8efb0701a3:/Makefile.m4

diff --git a/Makefile.m4 b/Makefile.m4
index 0d7414a..dff61c0 100644
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -1,7 +1,5 @@
 ## -*-makefile-*-
 ##
-## $Id: Makefile.m4,v 1.1 2002/02/19 22:54:13 mdw Exp $
-##
 ## Build system for mdwfonts
 ##
 ## (c) 2002 Mark Wooding
@@ -25,35 +23,22 @@
 ## along with mdwfonts; if not, write to the Free Software Foundation,
 ## Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-##----- Revision history ----------------------------------------------------
-##
-## $Log: Makefile.m4,v $
-## Revision 1.1  2002/02/19 22:54:13  mdw
-## Initial revision.
-##
-## Revision 1.2  2002/02/03 20:57:21  mdw
-## Sort out distribution.
-##
-## Revision 1.1  2002/02/03 20:49:02  mdw
-## Checkin for new build system.
-##
-
 AUTOMAKE_OPTIONS = foreign
 
-texmfdir = @texmfdir@
-pkglatexdir = ${texmfdir}/tex/latex/${PACKAGE}
-pkgdocdir = ${texmfdir}/doc/latex/${PACKAGE}
-pkgtfmdir = ${texmfdir}/fonts/tfm/${PACKAGE}
-pkgvfdir = ${texmfdir}/fonts/vf/${PACKAGE}
-pkgetxdir = ${texmfdir}/tex/fontinst/${PACKAGE}
+texmfpath = @texmfpath@
+pkglatexdir = ${texmfpath}/tex/latex/${PACKAGE}
+pkgdocdir = ${texmfpath}/doc/latex/${PACKAGE}
+pkgtfmdir = ${texmfpath}/fonts/tfm/${PACKAGE}
+pkgvfdir = ${texmfpath}/fonts/vf/${PACKAGE}
+pkgetxdir = ${texmfpath}/tex/fontinst/${PACKAGE}
+pkmapdir = ${texmfpath}/dvips/${PACKAGE}
 
 FONTINST = @FONTINST@
 
 define(`addsuffix', `patsubst(`$1', `\>', `$2')')
 define(`BASE', `mdwfonts')
 define(`TFMBASE', `\
-	pcrb8a pcrb8rn pcrbo8a pcrbo8rn pcrr8a pcrr8rn \
-	pcrro8a pcrro8rn pplr8r pplri8r pzcmi8r')
+	pcrb8rn pcrbo8rn pcrr8rn pcrro8rn')
 define(`VFBASE', `\
 	pcrb7tn pcrb8tn pcrbc7tn pcrbc8tn pcrbo7tn pcrbo8tn pcrr7tn pcrr8tn \
 	pcrrc7tn pcrrc8tn pcrro7tn pcrro8tn zpplcmr zpplcmrm')
@@ -62,7 +47,8 @@ AUX = gpl.tex
 SRC = addsuffix(BASE, `.dtx')
 DVI = addsuffix(BASE, `.dvi')
 ETX = ot1tt.etx ot1ctt.etx
-INS = mdwfonts.sty mdwfonts.tex mdwfonts.map mttpcr.fd
+INS = mdwfonts.sty mdwfonts.tex mttpcr.fd
+MAP = mdwfonts.map
 FD = omlpplcm.fd ot1pplcm.fd
 PL = addsuffix(TFMBASE, `.pl')
 VPL = addsuffix(VFBASE, `.vpl')
@@ -74,6 +60,7 @@ pkgdoc_DATA = $(DVI)
 pkgtfm_DATA = $(TFM)
 pkgvf_DATA = $(VF)
 pkgetx_DATA = $(ETX)
+pkmap_DATA = $(MAP)
 
 SUFFIXES = .dtx .dvi .vf .tfm .pl .vpl
 define(`run_latex', `latex "\def\indexing{n} \nonstopmode \input $<"
@@ -81,8 +68,8 @@ define(`run_latex', `latex "\def\indexing{n} \nonstopmode \input $<"
 	makeindex -s gind.ist $`'*.idx
 	latex "\def\indexing{n} \nonstopmode \input $<"')
 
-.dtx.dvi: $(AUX)
-	run_latex
+$(DVI): $(AUX) $(INS)
+.dtx.dvi: run_latex
 .vpl.tfm:; vptovf $<
 .pl.tfm:; pltotf $<
 .vpl.vf:; vptovf $<
@@ -93,13 +80,14 @@ $(FD) $(VF) $(PL) $(VPL): mdwfonts.tex $(ETX)
 	$(FONTINST) "\nonstopmode \input mdwfonts.tex"
 
 EXTRA_DIST = \
-	$(SRC) $(AUX) $(INS) $(ETX) $(FD) $(TFM) $(VF) $(DVI) \
+	$(SRC) $(AUX) $(INS) $(ETX) $(FD) $(TFM) $(VF) $(PL) $(VPL) $(DVI) \
 	mdwfonts.ins Makefile.m4
 
 MAINTAINERCLEANFILES = $(INS) $(ETX) $(TFM) $(VF) $(DVI) *.fd
 CLEANFILES = \
-	*.tmp *.aux *.idx *.ilg *.log *.toc *.ind *.lot *.ans \
-	*.pl *.vpl *.mtx
+	*.tmp *.aux *.idx *.ilg *.log *.toc *.ind *.lot *.ans *.vpl \
+	p*.pl p*.mtx c*.mtx
+
 Makefile.am: Makefile.m4
 	cd $(srcdir) && m4 Makefile.m4 >Makefile.am