From 9f806e97a24bba61417ae312fcc0da40914266fb Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Wed, 4 May 2011 21:35:41 +0200
Subject: Imported Upstream version 0.8.999

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

(limited to 'data/Makefile.am')

diff --git a/data/Makefile.am b/data/Makefile.am
index f91d3a82..2a1d1cf4 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,10 +1,15 @@
 
 if HAVE_SYSTEMD
-systemdsystemunit_DATA = NetworkManager.service
+systemdsystemunit_DATA = \
+	NetworkManager.service \
+	NetworkManager-wait-online.service
 
 NetworkManager.service: NetworkManager.service.in
 	$(edit) $< >$@
 
+NetworkManager-wait-online.service: NetworkManager-wait-online.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)
@@ -14,13 +19,14 @@ $(service_DATA): $(service_in_files) Makefile
 endif
 
 edit = sed \
+	-e 's|@bindir[@]|$(bindir)|g' \
 	-e 's|@sbindir[@]|$(sbindir)|g' \
 	-e 's|@sysconfdir[@]|$(sysconfdir)|g' \
 	-e 's|@localstatedir[@]|$(localstatedir)|g'
 
 EXTRA_DIST = \
 	NetworkManager.service.in \
+	NetworkManager-wait-online.service.in \
 	org.freedesktop.NetworkManager.service.in
 
-CLEANFILES = NetworkManager.service org.freedesktop.NetworkManager.service
-
+CLEANFILES = NetworkManager.service NetworkManager-wait-online.service org.freedesktop.NetworkManager.service
-- 
cgit 1.3.0-6-gf8a5