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 | f794270c691efbadfcb0943b9deb3ff25f88b7a0 (patch) | |
| tree | f6355caa912a03280d52ae32b8ef9586c0b389da | |
| parent | 35e78956bedac4dc9df55cebc9f4ac2e4fdd8e5f (diff) | |
Add configure option to change the installed font dir.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | configure.ac | 7 |
3 files changed, 14 insertions, 2 deletions
@@ -1,3 +1,9 @@ +2005-11-15 Kevin E. Martin <kem-at-freedesktop-dot-org> + + * Makefile.am: + * configure.ac: + Add configure option to change the installed font dir. + 2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org> * configure.ac: diff --git a/Makefile.am b/Makefile.am index 437c2d5..2f82a49 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 = OTF FONT_FILES = \ SyrCOMAdiabene.otf \ SyrCOMAntioch.otf \ @@ -44,7 +43,7 @@ FONT_FILES = \ SyrCOMUrhoyBold.otf \ SyrCOMUrhoy.otf -fontdir = $(libdir)/X11/fonts/$(FONT_DIR) +fontdir = @FONTDIR@ font_DATA = $(FONT_FILES) EXTRA_DIST = $(FONT_FILES) license.txt README autogen.sh diff --git a/configure.ac b/configure.ac index 5a6ab3f..82b7468 100644 --- a/configure.ac +++ b/configure.ac @@ -28,6 +28,13 @@ AM_MAINTAINER_MODE AC_PROG_INSTALL +DEFAULT_FONTDIR=${libdir}/X11/fonts/OTF +AC_ARG_WITH(fontdir, + AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to install fonts]), + [FONTDIR="$withval"], + [FONTDIR="$DEFAULT_FONTDIR"]) +AC_SUBST(FONTDIR) + AC_PATH_PROG(MKFONTSCALE, mkfontscale) AC_PATH_PROG(MKFONTDIR, mkfontdir) AC_PATH_PROG(FCCACHE, fc-cache) |