3 files changed, 33 insertions, 8 deletions
diff --git a/xorg-server/fonts.src/TTF/42-luxi-mono.conf b/xorg-server/fonts.src/TTF/42-luxi-mono.conf
new file mode 100644
index 000000000..7babe825f
--- /dev/null
+++ b/xorg-server/fonts.src/TTF/42-luxi-mono.conf
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- force fontconfig to treat the Luxi Mono fonts as monospaced, even
+     though it detects multiple character widths -->
+<fontconfig>
+  <match target="scan">
+        <test name="family">
+                <string>Luxi Mono</string>
+        </test> 
+        <edit name="spacing"><int>100</int></edit>
+  </match>
+</fontconfig>
diff --git a/xorg-server/fonts.src/TTF/Makefile.am b/xorg-server/fonts.src/TTF/Makefile.am
index 6dc2eb694..a36f565c4 100644
--- a/xorg-server/fonts.src/TTF/Makefile.am
+++ b/xorg-server/fonts.src/TTF/Makefile.am
@@ -36,24 +36,34 @@ FONT_FILES = \
 fontdir = @FONTDIR@
 font_DATA = $(FONT_FILES)
 
+actualconfigdir = $(FC_CONFDIR)/conf.d
+availconfigdir = $(FC_CONFDIR)/conf.avail
+dist_availconfig_DATA = 42-luxi-mono.conf
+
 EXTRA_DIST = $(FONT_FILES) COPYRIGHT.BH
 
+MAINTAINERCLEANFILES = ChangeLog INSTALL
+
 install-data-hook:
 	@rm -f $(DESTDIR)$(fontdir)/fonts.scale
 	$(MKFONTSCALE) $(DESTDIR)$(fontdir)
 	@rm -f $(DESTDIR)$(fontdir)/font.dir
 	$(MKFONTDIR) $(DESTDIR)$(fontdir)
+	mkdir -p $(DESTDIR)$(actualconfigdir)
+	@rm -f $(DESTDIR)$(actualconfigdir)/$(dist_availconfig_DATA)
+	ln -s ../conf.avail/$(dist_availconfig_DATA) $(DESTDIR)$(actualconfigdir)
 	@RUN_FCCACHE@
 
 distuninstallcheck:
 	@:
 
-EXTRA_DIST += ChangeLog
-MAINTAINERCLEANFILES = ChangeLog
 
-.PHONY: ChangeLog
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+	$(INSTALL_CMD)
 
 ChangeLog:
 	$(CHANGELOG_CMD)
 
-dist-hook: ChangeLog
+dist-hook: ChangeLog INSTALL
diff --git a/xorg-server/fonts.src/TTF/configure.ac b/xorg-server/fonts.src/TTF/configure.ac
index 0d8528744..4d834f871 100644
--- a/xorg-server/fonts.src/TTF/configure.ac
+++ b/xorg-server/fonts.src/TTF/configure.ac
@@ -22,7 +22,9 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ([2.57])
-AC_INIT(font-bh-ttf, [1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-bh-ttf)
+AC_INIT([font-bh-ttf], [1.0.3],
+        [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+        [font-bh-ttf])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 
@@ -34,12 +36,13 @@ XORG_DEFAULT_OPTIONS
 
 AC_PROG_INSTALL
 
-# Require X.Org's font util macros 1.1 or later
+# Require X.Org's font util macros 1.2 or later
 m4_ifndef([XORG_FONT_MACROS_VERSION],
-	  [m4_fatal([must install X.Org font-util 1.1 or later before running autoconf/autogen])])
-XORG_FONT_MACROS_VERSION(1.1)
+	  [m4_fatal([must install X.Org font-util 1.2 or later before running autoconf/autogen])])
+XORG_FONT_MACROS_VERSION(1.2)
 
 XORG_FONTDIR([TTF])
 XORG_FONT_SCALED_UTILS
+XORG_FONT_FC_CONFDIR
 
 AC_OUTPUT([Makefile])