[PATCH] config.make: Use more configure settings when building xkb-data

[David Michael]

* config.make.in (datarootdir,YACC): New variable.
* configure.ac (XKB_BASE): Drop extraneous "/share" from path.
---

Hi,

I recently started building Hurd with X11 and ran into some minor troubles.

First, configure detects yacc, but it doesn't get substituted.  This
results in make's default YACC=yacc, so the build would fail on my
system with only GNU bison.

Also, the default XKB_PATH expands to use ${datarootdir}, which wasn't
substituted either.  This would cause the installation to misplace
files.  Correcting this also silences the following warning:

config.status: WARNING:  'config.make.in' seems to ignore the
--datarootdir setting

Comments?

Thanks.

David

 config.make.in | 2 ++
 configure.ac   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/config.make.in b/config.make.in
index b8002a1..b3eee54 100644
--- a/config.make.in
+++ b/config.make.in
@@ -30,6 +30,7 @@ sysconfdir = @sysconfdir@
 localstatedir = @localstatedir@
 sharedstatedir = @sharedstatedir@
 datadir = @datadir@
+datarootdir = @datarootdir@

 # All of those directories together:
 installationdirlist = $(hurddir) $(libdir) $(bindir) $(sbindir) \
@@ -48,6 +49,7 @@ MIG = @MIG@
 MIGCOM = $(MIG) -cc cat - /dev/null
 AWK = @AWK@
 SED = @SED@
+YACC = @YACC@

 # Compilation flags.  Append these to the definitions already made by
 # the specific Makefile.
diff --git a/configure.ac b/configure.ac
index 31e48ef..73598cf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -246,7 +246,7 @@ PKG_CHECK_MODULES([X11], [x11 xproto],
     AS_IF([test $pkg_failed = no],
       [XKB_BASE="$pkg_cv_XKB_BASE"
        AC_MSG_RESULT([$XKB_BASE])],
-      [XKB_BASE="$datadir/share/X11/xkb"
+      [XKB_BASE="$datadir/X11/xkb"
        AC_MSG_RESULT([(default) $XKB_BASE])])
     AC_MSG_CHECKING([for X11 prefix])
     _PKG_CONFIG([X11_PREFIX], [variable=prefix], [x11])
-- 
1.8.3.1