X-Git-Url: https://git.distorted.org.uk/~mdw/mdwfonts/blobdiff_plain/98eaa213abc90716c3c3ad96cfa6d94aef0f1561..HEAD:/Makefile.m4

diff --git a/Makefile.m4 b/Makefile.m4
index 236ba5c..2df5052 100644
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -1,6 +1,4 @@
-## -*-makefile-*-
-##
-## $Id$
+## -*-m4-*-
 ##
 ## Build system for mdwfonts
 ##
@@ -15,44 +13,24 @@
 ## it under the terms of the GNU General Public License as published by
 ## the Free Software Foundation; either version 2 of the License, or
 ## (at your option) any later version.
-## 
+##
 ## mdwfonts is distributed in the hope that it will be useful,
 ## but WITHOUT ANY WARRANTY; without even the implied warranty of
 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ## GNU General Public License for more details.
-## 
+##
 ## You should have received a copy of the GNU General Public License
 ## 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.3  2002/02/24 15:21:44  mdw
-## Ship all the intermediate files too.
-##
-## Revision 1.2  2002/02/24 12:34:46  mdw
-## Don't install intermediate results.  It messes everything up.
-##
-## 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}
-pkmapdir = ${texmfdir}/dvips/${PACKAGE}
+pkmapdir = ${texmfdir}/fonts/map/${PACKAGE}
 
 FONTINST = @FONTINST@
 
@@ -67,6 +45,8 @@ define(`VFBASE', `\
 AUX = gpl.tex
 SRC = addsuffix(BASE, `.dtx')
 DVI = addsuffix(BASE, `.dvi')
+PS = addsuffix(BASE, `.ps')
+PDF = addsuffix(BASE, `.pdf')
 ETX = ot1tt.etx ot1ctt.etx
 INS = mdwfonts.sty mdwfonts.tex mttpcr.fd
 MAP = mdwfonts.map
@@ -77,13 +57,13 @@ TFM = addsuffix(TFMBASE, `.tfm') addsuffix(VFBASE, `.tfm')
 VF = addsuffix(VFBASE, `.vf')
 
 pkglatex_DATA = $(INS) $(FD)
-pkgdoc_DATA = $(DVI)
+pkgdoc_DATA = $(DVI) $(PS) $(PDF)
 pkgtfm_DATA = $(TFM)
 pkgvf_DATA = $(VF)
 pkgetx_DATA = $(ETX)
 pkmap_DATA = $(MAP)
 
-SUFFIXES = .dtx .dvi .vf .tfm .pl .vpl
+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
@@ -91,27 +71,40 @@ define(`run_latex', `latex "\def\indexing{n} \nonstopmode \input $<"
 
 $(DVI): $(AUX) $(INS)
 .dtx.dvi: run_latex
+.dvi.ps:; dvips $<
+.ps.pdf:; ps2pdf $< $@
 .vpl.tfm:; vptovf $<
 .pl.tfm:; pltotf $<
 .vpl.vf:; vptovf $<
 
-$(ETX) $(INS): $(SRC) mdwfonts.ins
+$(ETX) $(MAP) $(INS): $(SRC) mdwfonts.ins
 	tex "\nonstopmode \input mdwfonts.ins"
 $(FD) $(VF) $(PL) $(VPL): mdwfonts.tex $(ETX)
 	$(FONTINST) "\nonstopmode \input mdwfonts.tex"
 
 EXTRA_DIST = \
 	$(SRC) $(AUX) $(INS) $(ETX) $(FD) $(TFM) $(VF) $(PL) $(VPL) $(DVI) \
+	$(MAP) \
 	mdwfonts.ins Makefile.m4
 
 MAINTAINERCLEANFILES = $(INS) $(ETX) $(TFM) $(VF) $(DVI) *.fd
 CLEANFILES = \
 	*.tmp *.aux *.idx *.ilg *.log *.toc *.ind *.lot *.ans *.vpl \
-	p*.pl p*.mtx c*.mtx
+	p*.pl p*.mtx c*.mtx *.ps *.pdf
 
 Makefile.am: Makefile.m4
 	cd $(srcdir) && m4 Makefile.m4 >Makefile.am
 
+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 ---------------------------------------------------