summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaetan Nadon <memsize@videotron.ca>2011-06-30 11:10:04 -0400
committerGaetan Nadon <memsize@videotron.ca>2011-07-11 09:10:08 -0400
commitca3e0b33d02a6a86b156008216bf94042b81ce71 (patch)
treed2e4885351144fbab11274c342f4878eea98a2f1
parente3d5c397965a017afd2288e7f991920edb50cee4 (diff)
Add distcheck support for configuration files when dir is not writable
Provide a user writable location for configuration files. Many values will work, but preserving the semantic by using a value based on the server default value is more helpful. The configdir automake variable and the pkgconfig sysconfigdir variable should not be confused with the sysconfdir automake provided configuration option which default value is $prefix/etc. Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
-rw-r--r--Makefile.am4
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index b6e15cd..6fdd067 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,9 @@
# During distcheck, system locations (as provided by pkg-config) may
# not be writable; provide instead relative locations.
-DISTCHECK_CONFIGURE_FLAGS = --with-sdkdir='$${includedir}/xorg'
+DISTCHECK_CONFIGURE_FLAGS = \
+ --with-sdkdir='$${includedir}/xorg' \
+ --with-xorg-conf-dir='$${datadir}/X11/xorg.conf.d'
SUBDIRS = include src man tools conf test
MAINTAINERCLEANFILES = ChangeLog INSTALL