diff options
| author | David Michael <fedora.dm0@gmail.com> | 2013-08-16 17:32:01 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-08-16 17:32:01 +0200 |
| commit | 7424060a895ea6beaaaa3cfcf090dd0438716aa9 (patch) | |
| tree | 65ce16198bac4836468444be7f3d90d100413ab8 | |
| parent | e848c0dee50ba029083d8a83a38d1c4536d37362 (diff) | |
config.make: Use more configure settings when building xkb-data
* config.make.in (datarootdir,LEX,YACC): New variables.
* configure.ac (XKB_BASE): Drop extraneous "/share" from path.
* configure.ac: Reset pkg-config status between tests.
| -rw-r--r-- | config.make.in | 3 | ||||
| -rw-r--r-- | configure.ac | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/config.make.in b/config.make.in index b8002a17..dbcf8a38 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,8 @@ MIG = @MIG@ MIGCOM = $(MIG) -cc cat - /dev/null AWK = @AWK@ SED = @SED@ +LEX = @LEX@ +YACC = @YACC@ # Compilation flags. Append these to the definitions already made by # the specific Makefile. diff --git a/configure.ac b/configure.ac index 31e48efd..b8275360 100644 --- a/configure.ac +++ b/configure.ac @@ -246,8 +246,9 @@ 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])]) + pkg_failed=no AC_MSG_CHECKING([for X11 prefix]) _PKG_CONFIG([X11_PREFIX], [variable=prefix], [x11]) AS_IF([test $pkg_failed = no], |