summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin E Martin <kem@kem.org>2005-07-22 04:13:44 +0000
committerKevin E Martin <kem@kem.org>2005-07-22 04:13:44 +0000
commit14b3f5680dbd6e6963b0df28fe6a0f44c6b41def (patch)
tree20033d3378e987c84f0e181c9f4115099ceb26fa
parentbffc96da62136c690033cc7f003f4caab249e0aa (diff)
Fix distcheck for fonts with multiple encodings
-rw-r--r--Makefile.am17
-rw-r--r--configure.ac3
2 files changed, 18 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index 3fc59b9..074ba7e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -207,7 +207,22 @@ font_DATA = \
$(ISO8859_15_PCF_FILES) \
$(ISO8859_16_PCF_FILES) \
$(KOI8_R_PCF_FILES)
-CLEANFILES = $(font_DATA) $(TRUNC_BDF_FILES)
+BUILT_BDF_FILES = \
+ $(ISO8859_1_BDF_FILES) \
+ $(ISO8859_2_BDF_FILES) \
+ $(ISO8859_3_BDF_FILES) \
+ $(ISO8859_4_BDF_FILES) \
+ $(ISO8859_5_BDF_FILES) \
+ $(ISO8859_7_BDF_FILES) \
+ $(ISO8859_8_BDF_FILES) \
+ $(ISO8859_9_BDF_FILES) \
+ $(ISO8859_10_BDF_FILES) \
+ $(ISO8859_13_BDF_FILES) \
+ $(ISO8859_14_BDF_FILES) \
+ $(ISO8859_15_BDF_FILES) \
+ $(ISO8859_16_BDF_FILES) \
+ $(KOI8_R_BDF_FILES)
+CLEANFILES = $(font_DATA) $(TRUNC_BDF_FILES) $(BUILT_BDF_FILES)
EXTRA_DIST = $(BDF_FILES) autogen.sh
diff --git a/configure.ac b/configure.ac
index 5a676a0..2c0994d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,7 +35,8 @@ AC_PATH_PROG(UCS2ANY, ucs2any)
AC_PATH_PROG(MKFONTSCALE, mkfontscale)
AC_PATH_PROG(MKFONTDIR, mkfontdir)
-UTILFONT_MAPFILES(MAPFILES)
+PKG_CHECK_MODULES(MAPS, [fontutil])
+MAPFILES_PATH=$(pkg-config --variable=mapdir fontutil)
AC_SUBST(MAPFILES_PATH)
AC_OUTPUT([Makefile])