summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2015-09-18 00:27:13 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2015-09-18 00:29:20 +1000
commit80c356f58fed47080eb6fa5756a122dbe14e5f6f (patch)
treedd982698b3f61eb707f5773ef338fc7906c70f24
parent1645a79c343ea3cf8bbd71a36e9106b22e541c71 (diff)
conf: install the libinput xorg.conf.d snippet
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--Makefile.am4
-rw-r--r--configure.ac7
2 files changed, 10 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index e67d235..4001f94 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,6 +27,8 @@ MAINTAINERCLEANFILES = ChangeLog INSTALL
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xorg-libinput.pc
+dist_xorgconf_DATA = conf/90-libinput.conf
+
.PHONY: ChangeLog INSTALL
INSTALL:
@@ -37,4 +39,4 @@ ChangeLog:
dist-hook: ChangeLog INSTALL
-EXTRA_DIST = conf/90-libinput.conf README.md
+EXTRA_DIST = README.md
diff --git a/configure.ac b/configure.ac
index bfb1d75..f42fee3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -56,6 +56,13 @@ AC_ARG_WITH(xorg-module-dir,
inputdir=${moduledir}/input
AC_SUBST(inputdir)
+AC_ARG_WITH(xorg-conf-dir,
+ AC_HELP_STRING([--with-xorg-conf-dir=DIR],
+ [Default xorg.conf.d directory [[default=$prefix/share/X11/xorg.conf.d/]]]),
+ [xorgconfdir="$withval"],
+ [xorgconfdir="$prefix/share/X11/xorg.conf.d"])
+AC_SUBST(xorgconfdir)
+
# X Server SDK location is required to install header files
sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server`