From 16391b048755896eec71059f5b410e666f3199fb Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@nwnk.net>
Date: Tue, 2 Aug 2005 01:58:09 +0000
Subject: Find mkfontscale through @bindir@ rather than AC_PATH_PROG, since the
 one     in the path could be from an old install that doesn't support all the
     needed flags.

---
 Makefile.am  | 2 +-
 configure.ac | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 3ce0f9f..5f12e2a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,7 +24,7 @@ bin_SCRIPTS = mkfontdir
 dist_man1_MANS = mkfontdir.man
 
 mkfontdir: mkfontdir.cpp
-	$(SED) s,BINDIR,`echo $(MKFONTSCALE) | $(SED) s,/[^/]*$$,,`, < mkfontdir.cpp | $(SED) s/XCOMM/\#/ > $@
+	$(SED) s,BINDIR,`echo @bindir@/mkfontscale | $(SED) s,/[^/]*$$,,`, < mkfontdir.cpp | $(SED) s/XCOMM/\#/ > $@
 
 EXTRA_DIST = mkfontdir.cpp
 CLEANFILES = $(bin_SCRIPTS)
diff --git a/configure.ac b/configure.ac
index 27030d6..96c919f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,7 @@ AM_MAINTAINER_MODE
 AC_PROG_INSTALL
 
 AC_PATH_PROG(SED, sed)
-AC_PATH_PROG(MKFONTSCALE, mkfontscale)
+AC_SUBST([bindir])
 
 XORG_RELEASE_VERSION
 
-- 
cgit v1.2.3