diff options
| author | Kevin E Martin <kem@kem.org> | 2005-12-09 05:48:44 +0000 |
|---|---|---|
| committer | Kevin E Martin <kem@kem.org> | 2005-12-09 05:48:44 +0000 |
| commit | 734f3d8f353f4f840ae02eb46af4430f2bbc9225 (patch) | |
| tree | d91637846326b7c851a06303b0d61920d85ff35d | |
| parent | c9c84cc31bebb09d619369ee7c02ee7c69aafe80 (diff) | |
Bug #5292: Make encodingsdir configurable (Donnie Berkholz).MODULAR_COPY
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | large/Makefile.am | 2 |
4 files changed, 17 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 0000000..9b70af2 --- /dev/null +++ b/ChangeLog @@ -0,0 +1,6 @@ +2005-12-09 Kevin E. Martin <kem-at-freedesktop-dot-org> + + * Makefile.am: + * configure.ac: + * large/Makefile.am: + Bug #5292: Make encodingsdir configurable (Donnie Berkholz). diff --git a/Makefile.am b/Makefile.am index 91af108..b1c17c7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = large -encodingsdir = $(libdir)/X11/fonts/encodings +encodingsdir = @ENCODINGSDIR@ ENCODING_FILES = \ adobe-dingbats.enc \ diff --git a/configure.ac b/configure.ac index 7bdf35b..1a17d66 100644 --- a/configure.ac +++ b/configure.ac @@ -18,6 +18,15 @@ if [[ -z $GZIP ]]; then AC_MSG_ERROR([gzip is needed to compress font encodings]) fi +m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))]) + +DEFAULT_ENCODINGSDIR=${libdir}/X11/fonts/encodings +AC_ARG_WITH(encodingsdir, + AS_HELP_STRING([--with-encodingsdir=ENCODINGSDIR], [Path to install font encodings]), + [ENCODINGSDIR="$withval"], + [ENCODINGSDIR="$DEFAULT_ENCODINGSDIR"]) +AC_SUBST(ENCODINGSDIR) + XORG_RELEASE_VERSION AC_OUTPUT([Makefile large/Makefile]) diff --git a/large/Makefile.am b/large/Makefile.am index 732a482..ced5c91 100644 --- a/large/Makefile.am +++ b/large/Makefile.am @@ -1,4 +1,4 @@ -encodingsdir = $(libdir)/X11/fonts/encodings/large +encodingsdir = @ENCODINGSDIR@/large ENCODING_FILES = \ big5.eten-0.enc \ |