diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2012-02-17 21:16:15 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2012-02-17 21:16:15 +0100 |
| commit | 1b9981e4188963b98c685ab20b6bec6aa851b1ce (patch) | |
| tree | 6285c4a8c839457b99e28aeb55c8f854e7da35c4 /data | |
| parent | cd4ca90b9de81d4a0430ad7782477f62035f5bbe (diff) | |
| parent | 04bae51189f37878b616505b5755ac736c63074a (diff) | |
| download | ayatana-indicator-printers-1b9981e4188963b98c685ab20b6bec6aa851b1ce.tar.gz ayatana-indicator-printers-1b9981e4188963b98c685ab20b6bec6aa851b1ce.tar.bz2 ayatana-indicator-printers-1b9981e4188963b98c685ab20b6bec6aa851b1ce.zip | |
Merging shared upstream rev into target branch.
Diffstat (limited to 'data')
| -rw-r--r-- | data/Makefile.am | 2 | ||||
| -rw-r--r-- | data/Makefile.in | 2 | ||||
| -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 |