aboutsummaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorSebastien Bacher <seb128@ubuntu.com>2012-02-17 21:16:15 +0100
committerSebastien Bacher <seb128@ubuntu.com>2012-02-17 21:16:15 +0100
commit04bae51189f37878b616505b5755ac736c63074a (patch)
treee1e1aa2b20a583a22b3986ffd8aaab1641587205 /data
parent6962983a99989042c371748efbfb48587a38e7b5 (diff)
parent66cdfa18d909ad66f376b217047664235ccfc6f8 (diff)
downloadayatana-indicator-printers-04bae51189f37878b616505b5755ac736c63074a.tar.gz
ayatana-indicator-printers-04bae51189f37878b616505b5755ac736c63074a.tar.bz2
ayatana-indicator-printers-04bae51189f37878b616505b5755ac736c63074a.zip
Prepared upstream tree for merging into target branch.
Diffstat (limited to 'data')
-rw-r--r--data/Makefile.am2
-rw-r--r--data/Makefile.in2
-rw-r--r--data/indicator-printers.service.in (renamed from data/indicator-printers.service)2
3 files changed, 3 insertions, 3 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index 1ecc4e7..133a853 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -5,7 +5,7 @@ dbus_services_DATA = indicator-printers.service
%.service: %.service.in
sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
-EXTRA_DIST = indicator-printers.service
+EXTRA_DIST = indicator-printers.service.in
CLEANFILES = $(dbus_services_DATA)
diff --git a/data/Makefile.in b/data/Makefile.in
index be9d926..4f07ba6 100644
--- a/data/Makefile.in
+++ b/data/Makefile.in
@@ -239,7 +239,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
dbus_servicesdir = $(DBUSSERVICEDIR)
dbus_services_DATA = indicator-printers.service
-EXTRA_DIST = indicator-printers.service
+EXTRA_DIST = indicator-printers.service.in
CLEANFILES = $(dbus_services_DATA)
all: all-am
diff --git a/data/indicator-printers.service b/data/indicator-printers.service.in
index 20bd30e..d89bcd2 100644
--- a/data/indicator-printers.service
+++ b/data/indicator-printers.service.in
@@ -1,3 +1,3 @@
[D-BUS Service]
Name=com.canonical.indicator.printers
-Exec=/usr/local/libexec/indicator-printers-service
+Exec=@libexecdir@/indicator-printers-service