afm/Makefile.am: New afmdir variable instead of custom install rules.

diff --git a/afm/ChangeLog b/afm/ChangeLog
index f4f5f22..05897c1 100644 (file)
--- a/afm/ChangeLog
+++ b/afm/ChangeLog
@@ -1,3 +1,11 @@
+2008-02-03  Tim Retout  <diocles@gnu.org>
+
+       * Makefile.am (install-data-local): Remove.
+       (uninstall-local): Likewise.
+       (EXTRA_DIST): Likewise.
+       (afmdir): New variable for location of afm files.
+       (dist_afm_DATA): New variable with previous contents of EXTRA_DIST.
+
 2008-01-29  Tim Retout  <diocles@gnu.org>
 
        * Makefile.am (install-data-local): Prefix install paths with

diff --git a/afm/Makefile.am b/afm/Makefile.am
index 59b3976..a4bb688 100644 (file)
--- a/afm/Makefile.am
+++ b/afm/Makefile.am
@@ -33,14 +33,6 @@ zcmi.afm zd.afm
 
 public_fonts = matrix.afm matrix.pfa
 
-EXTRA_DIST = font.map $(default_afm) $(public_fonts)
+afmdir = $(pkgdatadir)/afm
+dist_afm_DATA = font.map $(default_afm) $(public_fonts)
 
-install-data-local:
-       $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir)/enscript
-       $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir)/enscript/afm
-       for f in $(EXTRA_DIST); do \
-         $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(datadir)/enscript/afm/$$f; \
-       done
-
-uninstall-local:
-       rm -rf $(DESTDIR)$(datadir)/enscript/afm