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 | 117bc5fe9abe46a735e4501186739cbf47c9267a (patch) | |
| tree | a4210d5dbe07529abbb4a677edb9009c0f0f722f | |
| parent | 4229e49298ca8fc455520d24155148d4539c056b (diff) | |
Fix distcheck for fonts with multiple encodings
| -rw-r--r-- | Makefile.am | 20 | ||||
| -rw-r--r-- | configure.ac | 3 |
2 files changed, 20 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 3972ce2..c1508b4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -268,8 +268,24 @@ font_DATA = \ $(ISO8859_16_PCF_FILES) \ $(KOI8_R_PCF_FILES) \ $(JISX0201_PCF_FILES) -BUILT_SOURCES = $(font_DATA:%.pcf.gz=%.bdf) -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_11_BDF_FILES) \ + $(ISO8859_13_BDF_FILES) \ + $(ISO8859_14_BDF_FILES) \ + $(ISO8859_15_BDF_FILES) \ + $(ISO8859_16_BDF_FILES) \ + $(KOI8_R_BDF_FILES) \ + $(JISX0201_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 a3f8ee8..52a2c0f 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]) |