diff options
author | Kevin E Martin <kem@kem.org> | 2005-11-15 08:29:18 +0000 |
---|---|---|
committer | Kevin E Martin <kem@kem.org> | 2005-11-15 08:29:18 +0000 |
commit | 26e0c9be798a57ca81e28f527c1a675c2ba7b7bf (patch) | |
tree | be3c76a1d7b2ecb8dd49869a22fcf17c363471a7 | |
parent | 946dddc6585eb7847a437bd5e559a6dbe3b13622 (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 4cd3cd6..147fb21 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 = misc FONT_FILES = \ cursor @@ -32,7 +31,7 @@ SUFFIXES = .bdf .pcf.gz @rm -f $@ $(BDFTOPCF) -t $^ | gzip > $@ -fontdir = $(libdir)/X11/fonts/$(FONT_DIR) +fontdir = @FONTDIR@ font_DATA = $(PCF_FILES) CLEANFILES = $(font_DATA) diff --git a/configure.ac b/configure.ac index 9e7e269..4111695 100644 --- a/configure.ac +++ b/configure.ac @@ -32,6 +32,13 @@ AC_PATH_PROG(BDFTOPCF, bdftopcf) AC_PATH_PROG(MKFONTSCALE, mkfontscale) AC_PATH_PROG(MKFONTDIR, mkfontdir) +DEFAULT_FONTDIR=${libdir}/X11/fonts/misc +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]) |