diff options
| author | Dan Nicholson <dbn.lists@gmail.com> | 2009-02-02 22:35:20 -0800 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-02-03 19:56:45 +1000 |
| commit | 0f0743e3cfc2f7d288dfec3fba9bc093cbedf537 (patch) | |
| tree | 7fcf63a9c3d3bbd8cb1dbe1f56b552f70b7c85c3 | |
| parent | 095766ebb3afafc4906cb29e22d996dbcd773ad8 (diff) | |
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 <dbn.lists@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | 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. |