aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@canonical.com>2009-06-09 15:35:25 -0500
committerTed Gould <ted@canonical.com>2009-06-09 15:35:25 -0500
commit49c4646f0d2beb676e6d60d971fe7789253c4f38 (patch)
treeb7ee4d07012a4e801e999cfcd90e760029348b60
parent45361f6e3c6061d4630a630c8b2b48861e4cac57 (diff)
downloadayatana-indicator-session-49c4646f0d2beb676e6d60d971fe7789253c4f38.tar.gz
ayatana-indicator-session-49c4646f0d2beb676e6d60d971fe7789253c4f38.tar.bz2
ayatana-indicator-session-49c4646f0d2beb676e6d60d971fe7789253c4f38.zip
Oh, stealing the methods used in PolicyKit for building these. I dislike calling sed directly, but the results are fantastic.
-rw-r--r--configure.ac3
-rw-r--r--data/Makefile.am13
-rw-r--r--data/indicator-session.service.in2
-rw-r--r--data/indicator-status.service.in2
-rw-r--r--data/indicator-users.service.in2
5 files changed, 13 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac
index 512914e..742403a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,9 +46,6 @@ AC_OUTPUT([
Makefile
src/Makefile
data/Makefile
-data/indicator-status.service
-data/indicator-users.service
-data/indicator-session.service
])
###########################
diff --git a/data/Makefile.am b/data/Makefile.am
index de1d603..03e4cb8 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,5 +1,12 @@
dbus_servicesdir = $(DBUSSERVICEDIR)
-dbus_services_DATA = indicator-status.service \
- indicator-users.service \
- indicator-session.service
+service_in_files = indicator-status.service.in \
+ indicator-users.service.in \
+ indicator-session.service.in
+dbus_services_DATA = $(service_in_files:.service.in=.service)
+
+$(dbus_services_DATA): $(service_in_files) Makefile
+ @sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
+
+EXTRA_DIST = $(service_in_files)
+
diff --git a/data/indicator-session.service.in b/data/indicator-session.service.in
index 8d63285..790600a 100644
--- a/data/indicator-session.service.in
+++ b/data/indicator-session.service.in
@@ -1,3 +1,3 @@
[D-BUS Service]
Name=com.ubuntu.indicator.session
-Exec=@libexec@/indicator-session-service
+Exec=@libexecdir@/indicator-session-service
diff --git a/data/indicator-status.service.in b/data/indicator-status.service.in
index c2b3b28..9fe92ad 100644
--- a/data/indicator-status.service.in
+++ b/data/indicator-status.service.in
@@ -1,3 +1,3 @@
[D-BUS Service]
Name=com.ubuntu.indicator.status
-Exec=@libexec@/indicator-status-service
+Exec=@libexecdir@/indicator-status-service
diff --git a/data/indicator-users.service.in b/data/indicator-users.service.in
index 7ffbaa1..2843743 100644
--- a/data/indicator-users.service.in
+++ b/data/indicator-users.service.in
@@ -1,3 +1,3 @@
[D-BUS Service]
Name=com.ubuntu.indicator.users
-Exec=@libexec@/indicator-users-service
+Exec=@libexecdir@/indicator-users-service