From a4256940da049f91bbbea5e53e469a59ea9c10f7 Mon Sep 17 00:00:00 2001
From: Sjoerd Simons <sjoerd@luon.net>
Date: Fri, 25 Oct 2013 21:20:58 +0200
Subject: Imported Upstream version 0.9.8.8

---
 data/Makefile.am | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

(limited to 'data/Makefile.am')

diff --git a/data/Makefile.am b/data/Makefile.am
index 2a1d1cf4..71a390d5 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -2,13 +2,22 @@
 if HAVE_SYSTEMD
 systemdsystemunit_DATA = \
 	NetworkManager.service \
-	NetworkManager-wait-online.service
+	NetworkManager-wait-online.service \
+	NetworkManager-dispatcher.service
 
 NetworkManager.service: NetworkManager.service.in
 	$(edit) $< >$@
 
+if HAVE_SYSTEMD_200
 NetworkManager-wait-online.service: NetworkManager-wait-online.service.in
 	$(edit) $< >$@
+else
+NetworkManager-wait-online.service: NetworkManager-wait-online-systemd-pre200.service.in
+	$(edit) $< >$@
+endif
+
+NetworkManager-dispatcher.service: NetworkManager-dispatcher.service.in
+	$(edit) $< >$@
 
 servicedir = $(datadir)/dbus-1/system-services
 service_in_files = org.freedesktop.NetworkManager.service.in
@@ -22,11 +31,19 @@ edit = sed \
 	-e 's|@bindir[@]|$(bindir)|g' \
 	-e 's|@sbindir[@]|$(sbindir)|g' \
 	-e 's|@sysconfdir[@]|$(sysconfdir)|g' \
-	-e 's|@localstatedir[@]|$(localstatedir)|g'
+	-e 's|@localstatedir[@]|$(localstatedir)|g' \
+	-e 's|@libexecdir[@]|$(libexecdir)|g'
 
 EXTRA_DIST = \
 	NetworkManager.service.in \
 	NetworkManager-wait-online.service.in \
+	NetworkManager-wait-online-systemd-pre200.service.in \
+	NetworkManager-dispatcher.service.in \
 	org.freedesktop.NetworkManager.service.in
 
-CLEANFILES = NetworkManager.service NetworkManager-wait-online.service org.freedesktop.NetworkManager.service
+CLEANFILES = \
+	NetworkManager.service \
+	NetworkManager-wait-online.service \
+	NetworkManager-dispatcher.service \
+	org.freedesktop.NetworkManager.service
+
-- 
cgit 1.3.0-6-gf8a5