diff options
| author | Kevin E Martin <kem@kem.org> | 2005-11-15 08:29:19 +0000 |
|---|---|---|
| committer | Kevin E Martin <kem@kem.org> | 2005-11-15 08:29:19 +0000 |
| commit | 031639facd5527a073bf73026908c5fd4bbd50e8 (patch) | |
| tree | a63f9fe1f6128601e135bb828ef4ffb11f86ef23 | |
| parent | 137e55b38e06e0a9d4096d33c7e82791a891c480 (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 a240093..56cb3ce 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 = cyrillic FONT_FILES = \ koi12x24b \ koi12x24 \ @@ -46,7 +45,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 5ae2bc6..e363c46 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/cyrillic +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]) |