Merge commit 'upstream/0.8.2' into experimental

1 files changed, 26 insertions, 0 deletions

diff --git a/data/Makefile.am b/data/Makefile.am
new file mode 100644
index 00000000..f91d3a82
--- /dev/null
+++ b/data/Makefile.am
@@ -0,0 +1,26 @@
+
+if HAVE_SYSTEMD
+systemdsystemunit_DATA = NetworkManager.service
+
+NetworkManager.service: NetworkManager.service.in
+	$(edit) $< >$@
+
+servicedir = $(datadir)/dbus-1/system-services
+service_in_files = org.freedesktop.NetworkManager.service.in
+service_DATA = $(service_in_files:.service.in=.service)
+
+$(service_DATA): $(service_in_files) Makefile
+	$(edit) $< >$@
+endif
+
+edit = sed \
+	-e 's|@sbindir[@]|$(sbindir)|g' \
+	-e 's|@sysconfdir[@]|$(sysconfdir)|g' \
+	-e 's|@localstatedir[@]|$(localstatedir)|g'
+
+EXTRA_DIST = \
+	NetworkManager.service.in \
+	org.freedesktop.NetworkManager.service.in
+
+CLEANFILES = NetworkManager.service org.freedesktop.NetworkManager.service
+