[Xfce4-commits] <xfce4-notifyd:master> Move xfce4-notifyd to $(libdir)/xfce4/notifyd.

[Nick Schermer]

Updating branch refs/heads/master
         to fd6cf48061d83b20e93ff9a4399dfd8301fd3f77 (commit)
       from 6bf731bc040f6c008421da365ce11e4a22b89b7a (commit)

commit fd6cf48061d83b20e93ff9a4399dfd8301fd3f77
Author: Nick Schermer <nick at xfce.org>
Date:   Thu Aug 26 21:53:07 2010 +0200

    Move xfce4-notifyd to $(libdir)/xfce4/notifyd.

 Makefile.am                                        |    5 +++--
 .../org.freedesktop.Notifications.service.in       |    2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index c396e21..d00596f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,7 +13,8 @@ distclean_intltool = \
 	intltool-merge \
 	intltool-update
 
-libexec_PROGRAMS = xfce4-notifyd/xfce4-notifyd
+xfce4_notifyddir = $(libdir)/xfce4/notifyd
+xfce4_notifyd_PROGRAMS = xfce4-notifyd/xfce4-notifyd
 bin_PROGRAMS = xfce4-notifyd-config/xfce4-notifyd-config
 
 xfce4_notifyd_xfce4_notifyd_SOURCES = \
@@ -216,7 +217,7 @@ install-data-hook:
 	fi
 
 xfce4-notifyd/%.service: $(srcdir)/xfce4-notifyd/%.service.in Makefile
-	sed -e "s,\@libexecdir\@,$(libexecdir),g" < $< > $@
+	sed -e "s,\@notifydir\@,$(xfce4_notifyddir),g" < $< > $@
 
 distclean-local:
 	-rm -rf *.cache *~
diff --git a/xfce4-notifyd/org.freedesktop.Notifications.service.in b/xfce4-notifyd/org.freedesktop.Notifications.service.in
index 35f1afd..578a4b5 100644
--- a/xfce4-notifyd/org.freedesktop.Notifications.service.in
+++ b/xfce4-notifyd/org.freedesktop.Notifications.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.freedesktop.Notifications
-Exec=@libexecdir@/xfce4-notifyd
+Exec=@notifydir@/xfce4-notifyd