diff options
| author | Keith Packard <keithp@keithp.com> | 2009-10-21 16:46:55 +0900 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2009-10-21 16:46:55 +0900 |
| commit | 08e7f62faf72540cb3a6f1023024c145f7fa1a23 (patch) | |
| tree | 3fd52c5968cd616ed4f7cfd2bc10ee9badafd5e7 | |
| parent | 522ca8179ad2b2b935993f08c9382cd5ad1d8b2f (diff) | |
Fix 'distcheck' to use host xkb files but install to build dir
'make distcheck' needs to read xkb files and write out compiled
versions as a part of the 'make check' phase. This patch passes
suitable options to the configure stage of the distcheck process to
read xkb files from the system location and write them to the
distcheck _inst directory.
Signed-off-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rw-r--r-- | configure.ac | 9 |
2 files changed, 12 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index cb98d2c31..a5e07307c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -51,6 +51,11 @@ endif EXTRA_DIST = xorg-server.pc.in xorg-server.m4 ChangeLog autogen.sh +DISTCHECK_CONFIGURE_FLAGS=\ + --with-xkb-path=$(XKB_BASE_DIRECTORY) \ + --with-xkb-bin-directory=$(XKB_BIN_DIRECTORY) \ + --with-xkb-output='$${datadir}/X11/xkb/compiled' + DISTCLEANFILES = doltcompile doltlibtool MAINTAINERCLEANFILES=ChangeLog diff --git a/configure.ac b/configure.ac index c4465d2a3..daa7276d2 100644 --- a/configure.ac +++ b/configure.ac @@ -1090,11 +1090,16 @@ AM_CONDITIONAL(INT10MODULE, test "x$INT10MODULE" = xyes) AC_DEFINE(SHAPE, 1, [Support SHAPE extension]) AC_DEFINE_DIR(XKB_BASE_DIRECTORY, XKBPATH, [Path to XKB data]) -AC_DEFINE_DIR(XKB_BIN_DIRECTORY, bindir, [Path to XKB bin dir]) +AC_ARG_WITH(xkb-bin-directory, + AS_HELP_STRING([--with-xkb-bin-directory=DIR], [Directory containing xkbcomp program]), + [XKB_BIN_DIRECTORY="$withval"], + [XKB_BIN_DIRECTORY="$bindir"]) + +AC_DEFINE_DIR(XKB_BIN_DIRECTORY, XKB_BIN_DIRECTORY, [Path to XKB bin dir]) dnl Make sure XKM_OUTPUT_DIR is an absolute path XKBOUTPUT_FIRSTCHAR=`echo $XKBOUTPUT | cut -b 1` -if [[ x$XKBOUTPUT_FIRSTCHAR != x/ ]] ; then +if [[ x$XKBOUTPUT_FIRSTCHAR != x/ -a x$XKBOUTPUT_FIRSTCHAR != 'x$' ]] ; then XKBOUTPUT="$XKB_BASE_DIRECTORY/$XKBOUTPUT" fi |