diff options
Diffstat (limited to 'meta/recipes-support/atk/at-spi2-core/0001-build-Add-with-systemduserunitdir.patch')
| -rw-r--r-- | meta/recipes-support/atk/at-spi2-core/0001-build-Add-with-systemduserunitdir.patch | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/meta/recipes-support/atk/at-spi2-core/0001-build-Add-with-systemduserunitdir.patch b/meta/recipes-support/atk/at-spi2-core/0001-build-Add-with-systemduserunitdir.patch index 4103eaa2e5..1f8c9f374f 100644 --- a/meta/recipes-support/atk/at-spi2-core/0001-build-Add-with-systemduserunitdir.patch +++ b/meta/recipes-support/atk/at-spi2-core/0001-build-Add-with-systemduserunitdir.patch @@ -1,4 +1,4 @@ -From 2f47c975ebe52b6916a45ade023ae3bac21bb0e0 Mon Sep 17 00:00:00 2001 +From fa376762b92404b9e3c430054b8c3341ca0fdd8b Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen <jussi.kukkonen@intel.com> Date: Tue, 21 Jun 2016 16:00:02 +0300 Subject: [PATCH] build: Add --with-systemduserunitdir @@ -8,29 +8,30 @@ allow overriding the value. Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=767911] Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> + --- bus/Makefile.am | 2 +- - configure.ac | 7 +++++++ - 2 files changed, 8 insertions(+), 1 deletion(-) + configure.ac | 9 +++++++++ + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/bus/Makefile.am b/bus/Makefile.am -index b189e02..52fbb0b 100644 +index 688f82a..10cde62 100644 --- a/bus/Makefile.am +++ b/bus/Makefile.am -@@ -26,7 +26,7 @@ dbusservice_DATA = org.a11y.Bus.service - org.a11y.Bus.service: org.a11y.Bus.service.in - sed -e $(substitutions) $< > $@.tmp && mv $@.tmp $@ +@@ -29,7 +29,7 @@ org.a11y.Bus.service: org.a11y.Bus.service.in + EXTRA_DIST += org.a11y.Bus.service.in + CLEANFILES += org.a11y.Bus.service -systemd_userdir = $(prefix)/lib/systemd/user +systemd_userdir = $(systemduserunitdir) systemd_user_DATA = at-spi-dbus-bus.service at-spi-dbus-bus.service: at-spi-dbus-bus.service.in Makefile - sed -e $(substitutions) $< > $@.tmp && mv $@.tmp $@ + $(AM_V_GEN) $(SED) -e $(substitutions) $< > $@.tmp && mv $@.tmp $@ diff --git a/configure.ac b/configure.ac -index f9061c2..2b8eeed 100644 +index 8c4fca2..1415cca 100644 --- a/configure.ac +++ b/configure.ac -@@ -183,6 +183,13 @@ else +@@ -146,6 +146,15 @@ else fi AC_SUBST(DBUS_SERVICES_DIR) @@ -41,9 +42,11 @@ index f9061c2..2b8eeed 100644 + [with_systemduserunitdir=$($PKG_CONFIG --variable=systemduserunitdir systemd)]) +AC_SUBST([systemduserunitdir], [$with_systemduserunitdir]) + - AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums) ++AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums) ++ + GOBJECT_INTROSPECTION_CHECK([1.32.0]) - GOBJECT_INTROSPECTION_CHECK([0.9.6]) + AC_SUBST(LIBTOOL_EXPORT_OPTIONS) -- -2.1.4 +2.14.1 |