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 | 1e380ad6aeb7e98cee5a33a2fbaacbcd38adaa99 (patch) | |
| tree | 2ccacf6e416fb92f1756c45668529a82f4277208 | |
| parent | c3c567f8e335b292e2161dfa03584fbd24b903c7 (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 1330f06..e7c2d91 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 = \ jiskan16 \ jiskan24 @@ -33,7 +32,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 2919758..6a27142 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]) |