diff options
author | Kevin E Martin <kem@kem.org> | 2005-07-22 04:13:44 +0000 |
---|---|---|
committer | Kevin E Martin <kem@kem.org> | 2005-07-22 04:13:44 +0000 |
commit | 7cbcc21779cad9820e15f72611f5fccf9ff98002 (patch) | |
tree | 78e7fb632e80f2bfdd63eb05b681821a9f4b984c | |
parent | ba295e2c7dec0aad6408238f07043d29056d6225 (diff) |
Fix distcheck for fonts with multiple encodings
-rw-r--r-- | Makefile.am | 13 | ||||
-rw-r--r-- | configure.ac | 3 |
2 files changed, 13 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 3c62b6d..1666943 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) -CLEANFILES = $(font_DATA) -BUILT_SOURCES = $(font_DATA:%.pcf.gz=%.bdf) +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 4db8f96..c046c89 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]) |