[Xfce4-commits] <tumbler:master> Move tumblerd to $libdir/tumbler-1.

[Nick Schermer]

Updating branch refs/heads/master
         to aa56247bf15c3166a69ed114ca3349b7209a03cd (commit)
       from a2170318f8c1f60a8a009b57337118cd0031765d (commit)

commit aa56247bf15c3166a69ed114ca3349b7209a03cd
Author: Nick Schermer <nick at xfce.org>
Date:   Thu Aug 26 20:52:35 2010 +0200

    Move tumblerd to $libdir/tumbler-1.

 tumblerd/Makefile.am                              |    8 ++++++--
 tumblerd/org.xfce.Tumbler.Cache1.service.in       |    2 +-
 tumblerd/org.xfce.Tumbler.Manager1.service.in     |    2 +-
 tumblerd/org.xfce.Tumbler.Thumbnailer1.service.in |    2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/tumblerd/Makefile.am b/tumblerd/Makefile.am
index 230468b..26b61d6 100644
--- a/tumblerd/Makefile.am
+++ b/tumblerd/Makefile.am
@@ -17,7 +17,10 @@
 # Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 # Boston, MA 02110-1301, USA.
 
-libexec_PROGRAMS =							\
+tumblerddir =								\
+	$(libdir)/tumbler-$(TUMBLER_VERSION_API)
+
+tumblerd_PROGRAMS =							\
 	tumblerd
 
 tumblerd_built_sources =						\
@@ -81,7 +84,8 @@ service_in_files = 							\
 service_DATA = $(service_in_files:.service.in=.service)
 
 %.service: %.service.in
-	sed -e "s,\@libexecdir\@,$(libexecdir),g" < $< > $@
+	sed -e "s,\@libdir\@,$(libdir),g"				\
+	    -e "s,\@TUMBLER_VERSION_API\@,$(TUMBLER_VERSION_API),g" < $< > $@
 
 CLEANFILES =								\
 	$(service_DATA)
diff --git a/tumblerd/org.xfce.Tumbler.Cache1.service.in b/tumblerd/org.xfce.Tumbler.Cache1.service.in
index 814897b..db5fb1a 100644
--- a/tumblerd/org.xfce.Tumbler.Cache1.service.in
+++ b/tumblerd/org.xfce.Tumbler.Cache1.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.freedesktop.thumbnails.Cache1
-Exec=@libexecdir@/tumblerd
+Exec=@libdir@/tumbler- at TUMBLER_VERSION_API@/tumblerd
diff --git a/tumblerd/org.xfce.Tumbler.Manager1.service.in b/tumblerd/org.xfce.Tumbler.Manager1.service.in
index 6a0791b..4eb029b 100644
--- a/tumblerd/org.xfce.Tumbler.Manager1.service.in
+++ b/tumblerd/org.xfce.Tumbler.Manager1.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.freedesktop.thumbnails.Manager1
-Exec=@libexecdir@/tumblerd
+Exec=@libdir@/tumbler- at TUMBLER_VERSION_API@/tumblerd
diff --git a/tumblerd/org.xfce.Tumbler.Thumbnailer1.service.in b/tumblerd/org.xfce.Tumbler.Thumbnailer1.service.in
index 2dc0a33..18b96f7 100644
--- a/tumblerd/org.xfce.Tumbler.Thumbnailer1.service.in
+++ b/tumblerd/org.xfce.Tumbler.Thumbnailer1.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.freedesktop.thumbnails.Thumbnailer1
-Exec=@libexecdir@/tumblerd
+Exec=@libdir@/tumbler- at TUMBLER_VERSION_API@/tumblerd