From 0a96a5f2b354a6d907ede30e170ec99663496554 Mon Sep 17 00:00:00 2001 From: Dan Nicholson Date: Mon, 2 Feb 2009 22:35:20 -0800 Subject: [PATCH] Really fix distcheck distcheck has an annoying feature where it checks that all files install under $prefix. Unfortunately, this conflicts with the desire to install headers to the SDK directory. Workaround by passing --with-sdkdir during distcheck. Signed-off-by: Dan Nicholson --- Makefile.am | 3 +++ configure.ac | 10 ++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 3a59a65..54814c3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,6 +20,9 @@ AUTOMAKE_OPTIONS = foreign +# Ensure headers are installed below $(prefix) for distcheck +DISTCHECK_CONFIGURE_FLAGS = --with-sdkdir='$${includedir}/xorg' + if BUILD_TEST test_dir=test endif diff --git a/configure.ac b/configure.ac index 809799f..eeabecb 100644 --- a/configure.ac +++ b/configure.ac @@ -71,12 +71,14 @@ fi # Checks for extensions XORG_DRIVER_CHECK_EXT(XINPUT, inputproto) -# Checks for pkg-config packages +# Checks for pkg-config packages. We need to be able to override sdkdir +# to satisfy silly distcheck requirements. PKG_CHECK_MODULES(XORG, xorg-server xproto $REQUIRED_MODULES) XORG_CFLAGS="$CWARNFLAGS $XORG_CFLAGS" -sdkdir=$(pkg-config --variable=sdkdir xorg-server | - sed -e 's@/usr/include@$(includedir)@') -AC_SUBST(sdkdir) +AC_ARG_WITH([sdkdir], [], + [sdkdir="$withval"], + [sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server`]) +AC_SUBST([sdkdir]) # Checks for libraries. -- 1.5.6.6