diff options
| author | Adam Jackson <ajax@nwnk.net> | 2005-08-02 01:58:09 +0000 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2019-02-18 17:49:08 -0800 |
| commit | 1cb06c20467030fddf6a0a7be855f6849cadf7b4 (patch) | |
| tree | 5e7aae942867ca2c04f1b834fb76b42dee635365 | |
| parent | a8341c3f17050b253a9f55aba76f1d8437165c26 (diff) | |
mkfontdir: 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.
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 194ccc2..a12fe4f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,7 +26,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 8e8401e..66b1b70 100644 --- a/configure.ac +++ b/configure.ac @@ -63,7 +63,7 @@ XORG_WITH_LINT dnl From mkfontdir/configure.ac AC_PATH_PROG(SED, sed) -AC_PATH_PROG(MKFONTSCALE, mkfontscale) +AC_SUBST([bindir]) AC_CONFIG_FILES([ Makefile |