[at-spi2-core/wip/meson: 11/15] build: Find sed, instead of assuming it's in PATH

[Emmanuele Bassi <ebassi src gnome org>]

commit eee68e3dcd957a36d1d57f8b84efc10f635c6332
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Wed May 24 13:52:05 2017 +0100

    build: Find sed, instead of assuming it's in PATH

 bus/Makefile.am       |   42 ++++++++++++++++++++++--------------------
 configure.ac          |    1 +
 registryd/Makefile.am |    2 +-
 3 files changed, 24 insertions(+), 21 deletions(-)
---
diff --git a/bus/Makefile.am b/bus/Makefile.am
index cacf551..d5250dc 100644
--- a/bus/Makefile.am
+++ b/bus/Makefile.am
@@ -1,7 +1,6 @@
-CLEANFILES=
-
-busconfigdir = $(datadir)/defaults/at-spi2
-busconfig_DATA = accessibility.conf
+CLEANFILES =
+DISTCLEANFILES =
+EXTRA_DIST =
 
 libexec_PROGRAMS = at-spi-bus-launcher
 at_spi_bus_launcher_SOURCES = at-spi-bus-launcher.c
@@ -11,35 +10,38 @@ at_spi_bus_launcher_CPPFLAGS = -DSYSCONFDIR=\"$(sysconfdir)\" \
 at_spi_bus_launcher_CFLAGS = $(GIO_CFLAGS)
 at_spi_bus_launcher_LDADD = $(GIO_LIBS) $(X11_LIBS)
 
+substitutions = "s,@libexecdir[@],$(libexecdir),"
+
 default_sessiondir = $(sysconfdir)/xdg/autostart
 default_session_DATA = at-spi-dbus-bus.desktop
-
-substitutions = "s,@libexecdir[@],$(libexecdir),"
 at-spi-dbus-bus.desktop: at-spi-dbus-bus.desktop.in
-       sed -e$ $(substitutions)  $< > $@.tmp && mv $@.tmp $@
-EXTRA_DIST = at-spi-dbus-bus.desktop.in
+       $(AM_V_GEN) $(SED) -e$ $(substitutions)  $< > $@.tmp && mv $@.tmp $@
+
+EXTRA_DIST += at-spi-dbus-bus.desktop.in
 CLEANFILES += at-spi-dbus-bus.desktop
 
-dbusservicedir=$(DBUS_SERVICES_DIR)
+dbusservicedir = $(DBUS_SERVICES_DIR)
 dbusservice_DATA = org.a11y.Bus.service
-
 org.a11y.Bus.service: org.a11y.Bus.service.in
-       sed -e $(substitutions) $< > $@.tmp && mv $@.tmp $@
+       $(AM_V_GEN) $(SED) -e $(substitutions) $< > $@.tmp && mv $@.tmp $@
+
+EXTRA_DIST += org.a11y.Bus.service.in
+CLEANFILES += org.a11y.Bus.service
 
 systemd_userdir = $(prefix)/lib/systemd/user
 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 $@
 
-accessibility.conf: accessibility.conf.in
-       sed -e "s|[@]DATADIR[@]|$(datadir)|" $(srcdir)/$@.in > $@
+EXTRA_DIST += at-spi-dbus-bus.service.in
+CLEANFILES += at-spi-dbus-bus.service
 
-EXTRA_DIST += org.a11y.Bus.service.in \
-       at-spi-dbus-bus.service.in \
-       accessibility.conf.in
+busconfigdir = $(datadir)/defaults/at-spi2
+busconfig_DATA = accessibility.conf
+accessibility.conf: accessibility.conf.in
+       $(AM_V_GEN) $(SED) -e "s|[@]DATADIR[@]|$(datadir)|" $(srcdir)/$@.in > $@
 
-DISTCLEANFILES = org.a11y.Bus.service \
-       $(systemd_user_DATA) \
-       accessibility.conf
+EXTRA_DIST += accessibility.conf.in
+CLEANFILES += accessibility.conf
 
 -include $(top_srcdir)/git.mk
diff --git a/configure.ac b/configure.ac
index d041655..b871a34 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,6 +37,7 @@ AC_CONFIG_HEADERS([config.h])
 dnl translation of at-spi strings
 IT_PROG_INTLTOOL([0.40.0])
 
+AC_PROG_SED
 
 GETTEXT_PACKAGE="${PACKAGE}"
 AC_SUBST(GETTEXT_PACKAGE)
diff --git a/registryd/Makefile.am b/registryd/Makefile.am
index 2c93281..b30d185 100644
--- a/registryd/Makefile.am
+++ b/registryd/Makefile.am
@@ -59,7 +59,7 @@ service_in_files = org.a11y.atspi.Registry.service.in
 service_DATA     = $(service_in_files:.service.in=.service)
 
 $(service_DATA): $(service_in_files) Makefile
-       sed -e "s|[@]LIBEXECDIR[@]|$(libexecdir)|" $(srcdir)/$@.in > $@
+       $(AM_V_GEN)$(SED) -e "s|[@]LIBEXECDIR[@]|$(libexecdir)|" $(srcdir)/$@.in > $@
 
 DISTCLEANFILES = org.a11y.atspi.Registry.service
 EXTRA_DIST += org.a11y.atspi.Registry.service.in