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
commit0091651b29f8c64b15c3809230f49448646b8985 (patch)
tree70bc79c03ab0f65efadffab32999bde39f789dce
parentd2ebfde7153d91832671cce6abe640597ab0680a (diff)
Fix distcheck for fonts with multiple encodings
-rw-r--r--Makefile.am13
-rw-r--r--configure.ac3
2 files changed, 13 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index ceec366..795cf78 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -132,8 +132,17 @@ font_DATA = \
$(ISO8859_13_PCF_FILES) \
$(ISO8859_14_PCF_FILES) \
$(ISO8859_15_PCF_FILES)
-BUILT_SOURCES = $(font_DATA:%.pcf.gz=%.bdf)
-CLEANFILES = $(font_DATA)
+BUILT_BDF_FILES = \
+ $(ISO8859_1_BDF_FILES) \
+ $(ISO8859_2_BDF_FILES) \
+ $(ISO8859_3_BDF_FILES) \
+ $(ISO8859_4_BDF_FILES) \
+ $(ISO8859_9_BDF_FILES) \
+ $(ISO8859_10_BDF_FILES) \
+ $(ISO8859_13_BDF_FILES) \
+ $(ISO8859_14_BDF_FILES) \
+ $(ISO8859_15_BDF_FILES)
+CLEANFILES = $(font_DATA) $(BUILT_BDF_FILES)
EXTRA_DIST = $(BDF_FILES) autogen.sh
diff --git a/configure.ac b/configure.ac
index 5219e76..bd1b60a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,7 +33,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])