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
commitffa79d329702cecfb84e0d7b5331f9b7597fa3eb (patch)
treeb69dac0fefbc3add58bdcb865fbba6cc5f63e197
parent1bf46f420117ea276922796c6d454f72a73aa9a4 (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 6ed5258..2f3ef46 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -138,8 +138,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 be2a741..11424e5 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])