[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[hurd] 01/70: config.make: Use more configure settings when building xkb
From: |
Samuel Thibault |
Subject: |
[hurd] 01/70: config.make: Use more configure settings when building xkb-data |
Date: |
Mon, 16 Sep 2013 07:41:33 +0000 |
This is an automated email from the git hooks/post-receive script.
sthibault pushed a commit to branch upstream
in repository hurd.
commit 7424060a895ea6beaaaa3cfcf090dd0438716aa9
Author: David Michael <address@hidden>
Date: Fri Aug 16 17:32:01 2013 +0200
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.
---
config.make.in | 3 +++
configure.ac | 3 ++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/config.make.in b/config.make.in
index b8002a1..dbcf8a3 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 31e48ef..b827536 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],
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-hurd/hurd.git
- [hurd] 11/70: sutils: fix the semantic of -t, --types in fstab.c, (continued)
- [hurd] 11/70: sutils: fix the semantic of -t, --types in fstab.c, Samuel Thibault, 2013/09/16
- [hurd] 42/70: trans: register symlink translators as important, Samuel Thibault, 2013/09/16
- [hurd] 33/70: Reserve RPC ID for proc_set_init_task, Samuel Thibault, 2013/09/16
- [hurd] 06/70: mount: fix mount -oremount with one parameter, Samuel Thibault, 2013/09/16
- [hurd] 04/70: utils: escape arguments in remap.sh, Samuel Thibault, 2013/09/16
- [hurd] 30/70: umount: add a umount utility, Samuel Thibault, 2013/09/16
- [hurd] 32/70: Merge branch 'master-merge', Samuel Thibault, 2013/09/16
- [hurd] 28/70: libnetfs: implement file_get_translator_cntl, Samuel Thibault, 2013/09/16
- [hurd] 02/70: Fix polling pfinet tun for write, Samuel Thibault, 2013/09/16
- [hurd] 69/70: Large store support for ext2fs, Samuel Thibault, 2013/09/16
- [hurd] 01/70: config.make: Use more configure settings when building xkb-data,
Samuel Thibault <=
- [hurd] 09/70: mount: ignore mounted filesystems if --all is given, Samuel Thibault, 2013/09/16
- [hurd] 05/70: mount: add -n and --no-mtab arguments, Samuel Thibault, 2013/09/16
- [hurd] 29/70: libnetfs: handle dead-name notifications, Samuel Thibault, 2013/09/16
- [hurd] 16/70: Add configure checks for libdaemon, Samuel Thibault, 2013/09/16
- [hurd] 37/70: init: Mark all of inits children and init itself as important, Samuel Thibault, 2013/09/16
- [hurd] 57/70: libtrivfs: add fsys_get_children, Samuel Thibault, 2013/09/16
- [hurd] 61/70: libnetfs: add fsys_get_source, Samuel Thibault, 2013/09/16