Bug #5293: Use --with-top-fontdir instead of --with-aliasdir.MODULAR_COPY

6 files changed, 19 insertions, 10 deletions

diff --git a/100dpi/Makefile.am b/100dpi/Makefile.am
index 5a7a198..1e5710d 100644
--- a/100dpi/Makefile.am
+++ b/100dpi/Makefile.am
@@ -19,7 +19,7 @@
 #  NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
 #  CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-aliasdir = @ALIASDIR@/100dpi
+aliasdir = @TOPFONTDIR@/100dpi
 alias_DATA = fonts.alias
 
 EXTRA_DIST = $(alias_DATA)
diff --git a/75dpi/Makefile.am b/75dpi/Makefile.am
index 80c70a7..388290f 100644
--- a/75dpi/Makefile.am
+++ b/75dpi/Makefile.am
@@ -19,7 +19,7 @@
 #  NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
 #  CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-aliasdir = @ALIASDIR@/75dpi
+aliasdir = @TOPFONTDIR@/75dpi
 alias_DATA = fonts.alias
 
 EXTRA_DIST = $(alias_DATA)
diff --git a/ChangeLog b/ChangeLog
index 6b74a1c..944e995 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,4 +5,13 @@
 	* configure.ac:
 	* cyrillic/Makefile.am:
 	* misc/Makefile.am:
+	Bug #5293: Use --with-top-fontdir instead of --with-aliasdir.
+
+2005-12-09  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+
+	* 100dpi/Makefile.am:
+	* 75dpi/Makefile.am:
+	* configure.ac:
+	* cyrillic/Makefile.am:
+	* misc/Makefile.am:
 	Bug #5293: Make aliasdir configurable (Donnie Berkholz).
diff --git a/configure.ac b/configure.ac
index 296c131..11ae110 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,12 +30,12 @@ AC_PROG_INSTALL
 
 m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))])
 
-DEFAULT_ALIASDIR=${libdir}/X11/fonts
-AC_ARG_WITH(aliasdir,
-	AS_HELP_STRING([--with-aliasdir=ALIASDIR], [Path to install font encodings]),
-	[ALIASDIR="$withval"],
-	[ALIASDIR="$DEFAULT_ALIASDIR"])
-AC_SUBST(ALIASDIR)
+DEFAULT_TOPFONTDIR=${libdir}/X11/fonts
+AC_ARG_WITH(top-fontdir,
+	AS_HELP_STRING([--with-top-fontdir=<path>], [Path to top level font directory]),
+	[TOPFONTDIR="$withval"],
+	[TOPFONTDIR="$DEFAULT_TOPFONTDIR"])
+AC_SUBST(TOPFONTDIR)
 
 XORG_RELEASE_VERSION
 
diff --git a/cyrillic/Makefile.am b/cyrillic/Makefile.am
index 2e134ad..89f4e4a 100644
--- a/cyrillic/Makefile.am
+++ b/cyrillic/Makefile.am
@@ -19,7 +19,7 @@
 #  NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
 #  CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-aliasdir = @ALIASDIR@/cyrillic
+aliasdir = @TOPFONTDIR@/cyrillic
 alias_DATA = fonts.alias
 
 EXTRA_DIST = $(alias_DATA)
diff --git a/misc/Makefile.am b/misc/Makefile.am
index 7498493..91bb95e 100644
--- a/misc/Makefile.am
+++ b/misc/Makefile.am
@@ -19,7 +19,7 @@
 #  NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
 #  CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-aliasdir = @ALIASDIR@/misc
+aliasdir = @TOPFONTDIR@/misc
 alias_DATA = fonts.alias
 
 EXTRA_DIST = $(alias_DATA)