build: Use ACLTX_TEXMF_PATH for installation.

Also remove old CVS cruft and use autoconf-mode.

diff --git a/Makefile.m4 b/Makefile.m4
index 236ba5c..dff61c0 100644 (file)
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -1,7 +1,5 @@
 ## -*-makefile-*-
 ##
-## $Id$
-##
 ## Build system for mdwfonts
 ##
 ## (c) 2002 Mark Wooding
@@ -25,34 +23,15 @@
 ## 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}
+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@
 

diff --git a/configure.in b/configure.in
index f4fa030..39e55fb 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,4 @@
-dnl -*-fundamental-*-
-dnl
-dnl $Id: configure.in,v 1.1 2002/02/19 22:54:13 mdw Exp $
+dnl -*-autoconf-*-
 dnl
 dnl Configuration script for mdwfonts
 dnl
@@ -25,19 +23,9 @@ dnl You should have received a copy of the GNU General Public License
 dnl along with mdwfonts; if not, write to the Free Software Foundation,
 dnl Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-dnl ----- Revision history --------------------------------------------------
-dnl
-dnl $Log: configure.in,v $
-dnl Revision 1.1  2002/02/19 22:54:13  mdw
-dnl Initial revision.
-dnl
-dnl Revision 1.1  2002/02/03 20:49:03  mdw
-dnl Checkin for new build system.
-dnl
-
 AC_INIT(mdwfonts.ins)
 AM_INIT_AUTOMAKE(mdwfonts, 1.2.0)
-mdw_DIR_TEXMF
+ACLTX_TEXMF_PATH
 AC_CHECK_PROGS(FONTINST, fontinst, tex)
 AC_OUTPUT(Makefile)