diff options
| author | Kevin E Martin <kem@kem.org> | 2005-11-15 08:29:13 +0000 |
|---|---|---|
| committer | Kevin E Martin <kem@kem.org> | 2005-11-15 08:29:13 +0000 |
| commit | 21a76c1fec40e7ab651f17eb0db97c3bcbd0e445 (patch) | |
| tree | ca981819b5c23ed9579fa4670a7d3d86ce28db49 | |
| parent | b11d786b28d8a3f8ce1f0f7ef47437822da47682 (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 ee24418..4e02d96 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 = Type1 FONT_FILES = \ UTB_____.afm \ UTBI____.afm \ @@ -30,7 +29,7 @@ FONT_FILES = \ UTRG____.afm \ UTRG____.pfa -fontdir = $(libdir)/X11/fonts/$(FONT_DIR) +fontdir = @FONTDIR@ font_DATA = $(FONT_FILES) EXTRA_DIST = $(FONT_FILES) autogen.sh diff --git a/configure.ac b/configure.ac index a637fc9..9609e60 100644 --- a/configure.ac +++ b/configure.ac @@ -32,6 +32,13 @@ AC_PATH_PROG(MKFONTSCALE, mkfontscale) AC_PATH_PROG(MKFONTDIR, mkfontdir) AC_PATH_PROG(FCCACHE, fc-cache) +DEFAULT_FONTDIR=${libdir}/X11/fonts/Type1 +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]) |