Add configure option to change the installed font dir.

3 files changed, 22 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index f8ca8be..a743c2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 761a183..eeffe32 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,10 +19,10 @@
 #  NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
 #  CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-ttffontdir = $(libdir)/X11/fonts/TTF
+ttffontdir = @TTFFONTDIR@
 ttffont_DATA = GohaTibebZemen.ttf
 
-otffontdir = $(libdir)/X11/fonts/OTF
+otffontdir = @OTFFONTDIR@
 otffont_DATA = GohaTibebZemen.otf
 
 EXTRA_DIST = $(ttffont_DATA) $(otffont_DATA) license.txt autogen.sh
diff --git a/configure.ac b/configure.ac
index 3989d31..38e9835 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,6 +32,20 @@ AC_PATH_PROG(MKFONTSCALE, mkfontscale)
 AC_PATH_PROG(MKFONTDIR, mkfontdir)
 AC_PATH_PROG(FCCACHE, fc-cache)
 
+DEFAULT_TTFFONTDIR=${libdir}/X11/fonts/TTF
+AC_ARG_WITH(fontdir,
+	AS_HELP_STRING([--with-ttf-fontdir=FONTDIR], [Path to install TTF fonts]),
+	[TTFFONTDIR="$withval"],
+	[TTFFONTDIR="$DEFAULT_TTFFONTDIR"])
+AC_SUBST(TTFFONTDIR)
+
+DEFAULT_OTFFONTDIR=${libdir}/X11/fonts/OTF
+AC_ARG_WITH(fontdir,
+	AS_HELP_STRING([--with-otf-fontdir=FONTDIR], [Path to install OTF fonts]),
+	[OTFFONTDIR="$withval"],
+	[OTFFONTDIR="$DEFAULT_OTFFONTDIR"])
+AC_SUBST(OTFFONTDIR)
+
 XORG_RELEASE_VERSION
 
 AC_OUTPUT([Makefile])