From 473430a1c696c89c7067edd5a356a6fd070664a7 Mon Sep 17 00:00:00 2001 From: Tim Retout Date: Sun, 3 Feb 2008 15:36:25 +0000 Subject: [PATCH] afm/Makefile.am: New afmdir variable instead of custom install rules. --- afm/ChangeLog | 8 ++++++++ afm/Makefile.am | 12 ++---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/afm/ChangeLog b/afm/ChangeLog index f4f5f22..05897c1 100644 --- a/afm/ChangeLog +++ b/afm/ChangeLog @@ -1,3 +1,11 @@ +2008-02-03 Tim Retout + + * 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 * Makefile.am (install-data-local): Prefix install paths with diff --git a/afm/Makefile.am b/afm/Makefile.am index 59b3976..a4bb688 100644 --- 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 -- 2.17.1