[gnome-keyring] daemon: Distribute correct desktop autostart files

[Stefan Walter <stefw src gnome org>]

commit 27e27ed41f4c5e1739c7dd259105b6a20f3528d4
Author: Stef Walter <stefw collabora co uk>
Date:   Mon Dec 19 09:50:27 2011 +0100

    daemon: Distribute correct desktop autostart files
    
     * Distribute xxx.in.in files instead of xxx.in files
    
    https://bugzilla.gnome.org/show_bug.cgi?id=664185

 daemon/Makefile.am                     |   14 ++++++++------
 daemon/gnome-keyring-gpg.desktop.in.in |    2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index b598c5f..e9b9c1d 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -51,19 +51,21 @@ servicedir       = $(DBUS_SERVICES_DIR)
 service_DATA     = $(service_in_files:.service.in=.service)
 service_PATH     = $(VALGRIND_RUN)$(bindir)
 
-desktop_in_files = \
-	gnome-keyring-pkcs11.desktop.in \
-	gnome-keyring-secrets.desktop.in \
-	gnome-keyring-ssh.desktop.in \
-	gnome-keyring-gpg.desktop.in
+desktop_in_in_files = \
+	gnome-keyring-pkcs11.desktop.in.in \
+	gnome-keyring-secrets.desktop.in.in \
+	gnome-keyring-ssh.desktop.in.in \
+	gnome-keyring-gpg.desktop.in.in
+desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
 desktopdir       = $(sysconfdir)/xdg/autostart
 desktop_DATA     = $(desktop_in_files:.desktop.in=.desktop)
 
 EXTRA_DIST = \
 	$(service_in_files) \
-	$(desktop_in_files)
+	$(desktop_in_in_files)
 
 CLEANFILES = \
+	$(desktop_in_files) \
 	$(service_DATA) \
 	$(desktop_DATA)
 
diff --git a/daemon/gnome-keyring-gpg.desktop.in.in b/daemon/gnome-keyring-gpg.desktop.in.in
index f84c33d..4a87646 100644
--- a/daemon/gnome-keyring-gpg.desktop.in.in
+++ b/daemon/gnome-keyring-gpg.desktop.in.in
@@ -2,7 +2,7 @@
 Type=Application
 _Name=GPG Password Agent
 _Comment=GNOME Keyring: GPG Agent
-Exec= VALGRIND_RUN@ gnome-keyring-daemon --start --components=gpg
+Exec= VALGRIND_RUN@@BINDIR@/gnome-keyring-daemon --start --components=gpg
 OnlyShowIn=GNOME;Unity;
 X-GNOME-Autostart-Phase=Initialization
 X-GNOME-AutoRestart=false