diff options
| author | Kevin E Martin <kem@kem.org> | 2005-12-09 05:56:52 +0000 |
|---|---|---|
| committer | Kevin E Martin <kem@kem.org> | 2005-12-09 05:56:52 +0000 |
| commit | 25ea9d0868ecf3dccfbac5a82c659b852fb61d0e (patch) | |
| tree | cfaa48a31dc62eb1f1e5842687d92ffb2d6ca0ad | |
| parent | 3fc66a4a7e844d96c478ff35673ba6bbcd99df0a (diff) | |
| download | xorg-font-util-25ea9d0868ecf3dccfbac5a82c659b852fb61d0e.tar.gz | |
Bug #5175: Make mapdir configurable (David Coulthart and Donnie Berkholz).MODULAR_COPY
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | fontutil.pc.in | 2 |
4 files changed, 18 insertions, 4 deletions
@@ -1,3 +1,11 @@ +2005-12-09 Kevin E. Martin <kem-at-freedesktop-dot-org> + + * Makefile.am: + * configure.ac: + * fontutil.pc.in: + Bug #5175: Make mapdir configurable (David Coulthart and Donnie + Berkholz). + 2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org> * Makefile.am: diff --git a/Makefile.am b/Makefile.am index 0db6d33..d9d581b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -31,7 +31,7 @@ bdftruncate: $(top_srcdir)/bdftruncate.pl aclocaldir = $(datadir)/aclocal aclocal_DATA = fontutil.m4 -mapfilesdir = @mapdir@ +mapfilesdir = @MAPDIR@ mapfiles_DATA = \ map-ISO8859-1 \ map-ISO8859-2 \ diff --git a/configure.ac b/configure.ac index 18a8c1d..65d8974 100644 --- a/configure.ac +++ b/configure.ac @@ -31,8 +31,14 @@ AM_CONFIG_HEADER(config.h) AC_PROG_CC AC_PROG_INSTALL -mapdir="$libdir/X11/fonts/util" -AC_SUBST(mapdir) +m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))]) + +DEFAULT_MAPDIR=${libdir}/X11/fonts/util +AC_ARG_WITH(mapdir, + AS_HELP_STRING([--with-mapdir=MAPDIR], [Path to install font maps]), + [MAPDIR="$withval"], + [MAPDIR="$DEFAULT_MAPDIR"]) +AC_SUBST(MAPDIR) XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION diff --git a/fontutil.pc.in b/fontutil.pc.in index 3aeeaba..c0fc1b4 100644 --- a/fontutil.pc.in +++ b/fontutil.pc.in @@ -1,7 +1,7 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ -mapdir=@mapdir@ +mapdir=@MAPDIR@ Name: FontUtil Description: Font utilities dirs |