libinput: 1.7.3 → 1.9.1

This commit is contained in:
Jan Tojnar
2017-09-18 12:34:10 +02:00
parent fd115ece29
commit c01fd4a3e3
2 changed files with 20 additions and 23 deletions

View File

@@ -1,12 +1,11 @@
--- configure.ac 2016-05-27 14:00:25.248388226 +0200
+++ configure.ac 2016-05-27 14:01:28.228943416 +0200
@@ -214,7 +214,8 @@ AM_CONDITIONAL(BUILD_DOCS, [test "x$buil
# Used by the udev rules so we can use callouts during testing without
# installing everything first. Default is the empty string so the installed
# rule will use udev's default path. Override is in udev/Makefile.am
-AC_SUBST(UDEV_TEST_PATH, "")
+UDEV_TEST_PATH="${UDEV_DIR}/"
+AC_SUBST(UDEV_TEST_PATH)
AC_PATH_PROG(SED, [sed])
--- a/meson.build
+++ b/meson.build
@@ -100,7 +100,7 @@
args : model_quirks)
AC_CONFIG_FILES([Makefile
udev_rules_config = configuration_data()
-udev_rules_config.set('UDEV_TEST_PATH', '')
+udev_rules_config.set('UDEV_TEST_PATH', udev_dir + '/')
configure_file(input : 'udev/80-libinput-device-groups.rules.in',
output : '80-libinput-device-groups.rules',
install : true,