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 | f72272f3950f3c5e503a2971e7ffdbe4d34c8639 (patch) | |
| tree | 39ac4e10f295f5613a3c517b1682103bf63475ce | |
| parent | 633f26575d06995a8a4fd66ebaeb59563e15ea3c (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 f27c0f8..dccd758 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 = Speedo FONT_FILES = \ font0419.spd \ font0582.spd \ @@ -31,7 +30,7 @@ FONT_FILES = \ font0710.spd \ fonts.scale -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 f9d3c6c..b020679 100644 --- a/configure.ac +++ b/configure.ac @@ -30,6 +30,13 @@ AC_PROG_INSTALL AC_PATH_PROG(MKFONTDIR, mkfontdir) +DEFAULT_FONTDIR=${libdir}/X11/fonts/Speedo +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]) |