[PATCH xf86-input-synaptics] build: apply the distcheck tricks used in xf86-input-evdev

Diego Elio Pettenò flameeyes at gmail.com
Wed May 25 07:40:30 PDT 2011


With this change it is possible to complete "make distcheck" safely on the
module, as it no longer tries to write to system directories.

Since synaptics also installs a configuration file, xorg-conf-dir also
needs to be overridden during distcheck.
---
 Makefile.am  |    6 ++++++
 configure.ac |    5 +++++
 2 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 07cb902..0b1015b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,6 +18,12 @@
 #  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) are
+# not writable; provide instead relative locations.
+DISTCHECK_CONFIGURE_FLAGS = \
+	--with-sdkdir='$${includedir}/xorg' \
+	--with-xorg-conf-dir='${{sysconfdir}}/xorg'
+
 MAINTAINERCLEANFILES = ChangeLog INSTALL
 
 pkgconfigdir = $(libdir)/pkgconfig
diff --git a/configure.ac b/configure.ac
index 855092b..4dd31f9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -146,6 +146,11 @@ if test "x$have_libxtst" = "xyes" ; then
 fi
 dnl -----------------------------------------------------------------------------
 
+dnl Workaround overriding sdkdir to be able to create a tarball when user has no
+dnl write permission in sdkdir. See DISTCHECK_CONFIGURE_FLAGS in Makefile.am
+AC_ARG_WITH([sdkdir], [], [sdkdir="$withval"])
+AC_SUBST([sdkdir])
+
 AC_CONFIG_FILES([Makefile
                 xorg-synaptics.pc])
 AC_OUTPUT
-- 
1.7.5.rc3



More information about the xorg-devel mailing list