[notification-daemon] Move daemon back to libexecdir

[Matthias Clasen <matthiasc src gnome org>]

commit e05ae7cdc663ce2ea635c11fe78e9c07d2e1c9af
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Feb 16 11:35:17 2011 -0500

    Move daemon back to libexecdir
    
    No need to move it, really.

 configure.ac                                       |    2 +-
 data/Makefile.am                                   |    4 ++--
 ...esktop.in => notification-daemon.desktop.in.in} |    2 +-
 src/Makefile.am                                    |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 7a2a899..1591dbd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -171,7 +171,7 @@ AC_SUBST([AM_CXXFLAGS])
 AC_CONFIG_FILES([
 Makefile
 data/Makefile
-data/org.freedesktop.Notifications.service
+data/notification-daemon.desktop.in
 po/Makefile.in
 src/Makefile
 ])
diff --git a/data/Makefile.am b/data/Makefile.am
index c258b33..8f02f8d 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -3,7 +3,7 @@ desktopdir= $(datadir)/applications
 desktop_in_files = notification-daemon.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
-EXTRA_DIST = \
-	$(desktop_in_files)
+EXTRA_DIST = 			\
+	notification-daemon.desktop.in.in
 
 -include $(top_srcdir)/git.mk
diff --git a/data/notification-daemon.desktop.in b/data/notification-daemon.desktop.in.in
similarity index 75%
rename from data/notification-daemon.desktop.in
rename to data/notification-daemon.desktop.in.in
index 4d0c9aa..e13b8fe 100644
--- a/data/notification-daemon.desktop.in
+++ b/data/notification-daemon.desktop.in.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
 _Name=Notification Daemon
 _Comment=Display notifications
-Exec=notification-daemon
+Exec= LIBEXECDIR@/notification-daemon
 Terminal=false
 Type=Application
 NoDisplay=true
diff --git a/src/Makefile.am b/src/Makefile.am
index 8e8b257..384129b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-bin_PROGRAMS = notification-daemon
+libexec_PROGRAMS = notification-daemon
 
 notification_daemon_SOURCES = \
 	nd-notification.c \