[gnote] gnote-applet is in libexec. (Closes #581631)

[Hubert Figuière <hub src gnome org>]

commit 4cc81bfb1f45698931df6a2107ad036557cc047c
Author: Robert Millan <rmh aybabtu com>
Date:   Sun May 17 05:02:24 2009 -0400

    gnote-applet is in libexec. (Closes #581631)
---
 NEWS                                |    1 +
 data/GNOME_GnoteApplet.server.in.in |    2 +-
 data/Makefile.am                    |    4 ++--
 src/Makefile.am                     |    2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/NEWS b/NEWS
index eb5529f..75df9de 100644
--- a/NEWS
+++ b/NEWS
@@ -20,6 +20,7 @@ Fixes:
   * Fix UI for InsertTimeStamp addin (Closes #582788) (0.1.1)
   * Fix inconsistency in search dialog selection causing drag and 
     drop and delete to mis-behave. (Closes #579107, Closes #582757)
+  * gnote-applet is in libexec. (Closes #581631)
 
 Translations:
 
diff --git a/data/GNOME_GnoteApplet.server.in.in b/data/GNOME_GnoteApplet.server.in.in
index 33df0b0..034feca 100644
--- a/data/GNOME_GnoteApplet.server.in.in
+++ b/data/GNOME_GnoteApplet.server.in.in
@@ -1,7 +1,7 @@
 <oaf_info>
 <oaf_server iid="OAFIID:GnoteApplet_Factory" 
 	    type="exe"
-            location="@bindir@/@wrapper@">
+            location="@libexecdir@/@wrapper@">
 
         <oaf_attribute name="repo_ids" type="stringv">
                 <item value="IDL:Bonobo/GenericFactory:1.0"/>
diff --git a/data/Makefile.am b/data/Makefile.am
index 9169b63..4809d48 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -34,7 +34,7 @@ dbusservice_in_files = org.gnome.GNote.service.in
 dbusservice_DATA     = $(dbusservice_in_files:.service.in=.service)
 
 $(dbusservice_DATA): $(dbusservice_in_files) Makefile
-	sed -e "s|\ bindir\@|$(bindir)|g"	\
+	sed -e "s|\ libexecdir\@|$(libexecdir)|g"	\
 	    -e "s|\ wrapper\@|gnote-applet|g"		\
 	    < $< > $@
 endif
@@ -45,7 +45,7 @@ server_in_files = GNOME_GnoteApplet.server.in
 server_DATA     = $(server_in_files:.server.in=.server)
 
 $(server_in_files): $(server_in_files:.server.in=.server.in.in) Makefile
-	sed -e "s|\ bindir\@|$(bindir)|g"	\
+	sed -e "s|\ libexecdir\@|$(libexecdir)|g"	\
 	    -e "s|\ wrapper\@|gnote-applet|g"		\
 	    < $< > $@
 endif
diff --git a/src/Makefile.am b/src/Makefile.am
index 9b288fa..28c6056 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -51,7 +51,7 @@ APPLET_SOURCES=applet.hpp applet.cpp
 AM_CPPFLAGS+= LIBPANELAPPLETMM_CFLAGS@
 GNOTE_LIBS+= LIBPANELAPPLETMM_LIBS@
 
-bin_SCRIPTS=gnote-applet
+libexec_SCRIPTS=gnote-applet
 gnote-applet: gnote-applet.in Makefile
 	sed -e "s|\ bindir\@|$(bindir)|g"	\
 	    < $< > $@