diff options
| author | Kevin E Martin <kem@kem.org> | 2005-11-15 08:29:17 +0000 |
|---|---|---|
| committer | Kevin E Martin <kem@kem.org> | 2005-11-15 08:29:17 +0000 |
| commit | 8224335cc21ebb6a3e68dd634ff0846f2fecd834 (patch) | |
| tree | 538a4dd442c38c5933ed5365658e9a463562cf2c | |
| parent | 28e98a4f2d36a508243df045d496a51b6f7509cd (diff) | |
Add configure option to change the installed font dir.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | configure.ac | 7 |
3 files changed, 13 insertions, 2 deletions
@@ -0,0 +1,5 @@ +2005-11-15 Kevin E. Martin <kem-at-freedesktop-dot-org> + + * Makefile.am: + * configure.ac: + Add configure option to change the installed font dir. diff --git a/Makefile.am b/Makefile.am index 69c25bb..22eedd9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,7 +19,6 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -FONT_DIR = Type1 FONT_FILES = \ c0419bt_.afm \ c0419bt_.pfb \ @@ -38,7 +37,7 @@ FONT_FILES = \ c0649bt_.afm \ c0649bt_.pfb -fontdir = $(libdir)/X11/fonts/$(FONT_DIR) +fontdir = @FONTDIR@ font_DATA = $(FONT_FILES) EXTRA_DIST = $(FONT_FILES) Copyright autogen.sh diff --git a/configure.ac b/configure.ac index 11c2ff1..e7f2822 100644 --- a/configure.ac +++ b/configure.ac @@ -32,6 +32,13 @@ AC_PATH_PROG(MKFONTSCALE, mkfontscale) AC_PATH_PROG(MKFONTDIR, mkfontdir) AC_PATH_PROG(FCCACHE, fc-cache) +DEFAULT_FONTDIR=${libdir}/X11/fonts/Type1 +AC_ARG_WITH(fontdir, + AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to install fonts]), + [FONTDIR="$withval"], + [FONTDIR="$DEFAULT_FONTDIR"]) +AC_SUBST(FONTDIR) + XORG_RELEASE_VERSION AC_OUTPUT([Makefile]) |