summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaetan Nadon <memsize@videotron.ca>2011-06-30 10:15:24 -0400
committerGaetan Nadon <memsize@videotron.ca>2011-07-11 08:10:58 -0400
commite3d5c397965a017afd2288e7f991920edb50cee4 (patch)
treebfd1889a9c26058971c40c8eb5bb4faecdd05da0
parentce1c4ce6798e956e3fa68c68fde7b7900319bc31 (diff)
Add distcheck support for header files when sdk is not writable
During distcheck, a writable location is supplied for the install test. Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
-rw-r--r--Makefile.am4
-rw-r--r--configure.ac4
2 files changed, 8 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am
index edd28a6..b6e15cd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,6 +18,10 @@
# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+# During distcheck, system locations (as provided by pkg-config) may
+# not be writable; provide instead relative locations.
+DISTCHECK_CONFIGURE_FLAGS = --with-sdkdir='$${includedir}/xorg'
+
SUBDIRS = include src man tools conf test
MAINTAINERCLEANFILES = ChangeLog INSTALL
diff --git a/configure.ac b/configure.ac
index 2fe5289..adbf594 100644
--- a/configure.ac
+++ b/configure.ac
@@ -146,6 +146,10 @@ if test "x$have_libxtst" = "xyes" ; then
fi
# -----------------------------------------------------------------------------
+# Workaround overriding sdkdir to be able to create a tarball when user has no
+# write permission in sdkdir. See DISTCHECK_CONFIGURE_FLAGS in Makefile.am
+AC_ARG_WITH([sdkdir], [], [sdkdir="$withval"])
+
AC_CONFIG_FILES([Makefile
src/Makefile
man/Makefile