[gnome-keyring/gnome-2-30] Fix building of desktop and service files.

[Stefan Walter <stefw src gnome org>]

commit ca4a069d7dd00d66bca4f7169cc6938eb2dfc02e
Author: Stef Walter <stef memberwebs com>
Date:   Sun Jun 20 23:30:56 2010 +0000

    Fix building of desktop and service files.
    
     * Use proper full paths.
     * Don't use proprietary gmake extensions.

 configure.in                               |   12 +++++++++++-
 daemon/Makefile.am                         |   24 ++++++++++--------------
 daemon/gnome-keyring-pkcs11.desktop.in.in  |    2 +-
 daemon/gnome-keyring-secrets.desktop.in.in |    2 +-
 daemon/gnome-keyring-ssh.desktop.in.in     |    2 +-
 daemon/org.freedesktop.secrets.service.in  |    2 +-
 daemon/org.gnome.keyring.service.in        |    2 +-
 po/POTFILES.skip                           |    2 ++
 8 files changed, 28 insertions(+), 20 deletions(-)
---
diff --git a/configure.in b/configure.in
index f09d7d4..885f24e 100644
--- a/configure.in
+++ b/configure.in
@@ -541,7 +541,15 @@ AC_SUBST(LIBRARY_LIBS)
 AC_SUBST(P11_TESTS_CFLAGS)
 AC_SUBST(P11_TESTS_LIBS)
 
-BINDIR="$bindir"
+# HACK: Because autoconf is nasty
+if test "${prefix}" = "NONE"; then
+    prefix=/usr/local
+fi
+if test "${exec_prefix}" = "NONE"; then
+    exec_prefix=$prefix
+fi
+
+eval BINDIR="$bindir"
 AC_SUBST(BINDIR)
 
 AC_OUTPUT([
@@ -550,6 +558,8 @@ daemon/Makefile
 daemon/gnome-keyring-pkcs11.desktop.in
 daemon/gnome-keyring-secrets.desktop.in
 daemon/gnome-keyring-ssh.desktop.in
+daemon/org.gnome.keyring.service
+daemon/org.freedesktop.secrets.service
 daemon/control/Makefile
 daemon/control/tests/Makefile
 daemon/data/Makefile
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 9edb13f..df5583e 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -52,25 +52,13 @@ gnome_keyring_daemon_LDADD = \
 	$(GOBJECT_LIBS) \
 	$(GLIB_LIBS)
 
-EXTRA_DIST = \
+service_in_files = \
 	org.gnome.keyring.service.in \
-	org.freedesktop.secrets.service.in \
-	$(desktop_in_files)
-
-CLEANFILES = \
-	org.gnome.keyring.service \
-	org.freedesktop.service \
-	$(desktop_DATA)
-
+	org.freedesktop.secrets.service.in
 servicedir       = $(DBUS_SERVICES_DIR)
-service_in_files = org.gnome.keyring.service.in org.freedesktop.secrets.service.in
 service_DATA     = $(service_in_files:.service.in=.service)
 service_PATH     = $(VALGRIND_RUN)$(bindir)
 
-# Rule to make the service file with bindir expanded
-%.service: %.service.in Makefile
-	@sed -e "s|\ PATH\@|$(service_PATH)|" $< > $@
-
 desktop_in_files = \
 	gnome-keyring-pkcs11.desktop.in \
 	gnome-keyring-secrets.desktop.in \
@@ -78,4 +66,12 @@ desktop_in_files = \
 desktopdir       = $(sysconfdir)/xdg/autostart
 desktop_DATA     = $(desktop_in_files:.desktop.in=.desktop)
 
+EXTRA_DIST = \
+	$(service_in_files) \
+	$(desktop_in_files)
+
+CLEANFILES = \
+	$(service_DATA) \
+	$(desktop_DATA)
+
 @INTLTOOL_DESKTOP_RULE@
diff --git a/daemon/gnome-keyring-pkcs11.desktop.in.in b/daemon/gnome-keyring-pkcs11.desktop.in.in
index 6830858..ab96585 100644
--- a/daemon/gnome-keyring-pkcs11.desktop.in.in
+++ b/daemon/gnome-keyring-pkcs11.desktop.in.in
@@ -2,7 +2,7 @@
 Type=Application
 _Name=Certificate and Key Storage
 _Comment=GNOME Keyring: PKCS#11 Component
-Exec= VALGRIND_RUN@ gnome-keyring-daemon --start --components=pkcs11
+Exec= VALGRIND_RUN@@BINDIR@/gnome-keyring-daemon --start --components=pkcs11
 OnlyShowIn=GNOME;LXDE;
 AutostartCondition=GNOME /apps/gnome-keyring/daemon-components/pkcs11
 X-GNOME-Autostart-Phase=Initialization
diff --git a/daemon/gnome-keyring-secrets.desktop.in.in b/daemon/gnome-keyring-secrets.desktop.in.in
index d0ec19a..3235d65 100644
--- a/daemon/gnome-keyring-secrets.desktop.in.in
+++ b/daemon/gnome-keyring-secrets.desktop.in.in
@@ -2,7 +2,7 @@
 Type=Application
 _Name=Secret Storage Service
 _Comment=GNOME Keyring: Secret Service
-Exec= VALGRIND_RUN@ gnome-keyring-daemon --start --components=secrets
+Exec= VALGRIND_RUN@@BINDIR@/gnome-keyring-daemon --start --components=secrets
 OnlyShowIn=GNOME;LXDE;
 AutostartCondition=GNOME /apps/gnome-keyring/daemon-components/secrets
 X-GNOME-Autostart-Phase=Initialization
diff --git a/daemon/gnome-keyring-ssh.desktop.in.in b/daemon/gnome-keyring-ssh.desktop.in.in
index 968b46e..5dd59b2 100644
--- a/daemon/gnome-keyring-ssh.desktop.in.in
+++ b/daemon/gnome-keyring-ssh.desktop.in.in
@@ -2,7 +2,7 @@
 Type=Application
 _Name=SSH Key Agent
 _Comment=GNOME Keyring: SSH Agent
-Exec= VALGRIND_RUN@ gnome-keyring-daemon --start --components=ssh
+Exec= VALGRIND_RUN@@BINDIR@/gnome-keyring-daemon --start --components=ssh
 OnlyShowIn=GNOME;LXDE;
 AutostartCondition=GNOME /apps/gnome-keyring/daemon-components/ssh
 X-GNOME-Autostart-Phase=Initialization
diff --git a/daemon/org.freedesktop.secrets.service.in b/daemon/org.freedesktop.secrets.service.in
index d4db713..aab572a 100644
--- a/daemon/org.freedesktop.secrets.service.in
+++ b/daemon/org.freedesktop.secrets.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.freedesktop.secrets
-Exec= PATH@/gnome-keyring-daemon --start --foreground --components=secrets
+Exec= VALGRIND_RUN@@BINDIR@/gnome-keyring-daemon --start --foreground --components=secrets
diff --git a/daemon/org.gnome.keyring.service.in b/daemon/org.gnome.keyring.service.in
index 04dc017..a0f8ba4 100644
--- a/daemon/org.gnome.keyring.service.in
+++ b/daemon/org.gnome.keyring.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.gnome.keyring
-Exec= PATH@/gnome-keyring-daemon --start --foreground --components=secrets
+Exec= VALGRIND_RUN@@BINDIR@/gnome-keyring-daemon --start --foreground --components=secrets
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index d9cecbd..3438eb6 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,5 +1,7 @@
 daemon/gnome-keyring-pkcs11.desktop.in
 daemon/gnome-keyring-secrets.desktop.in
 daemon/gnome-keyring-ssh.desktop.in
+daemon/org.freedesktop.secrets.service.in
+daemon/org.gnome.keyring.service.in
 gcr/gcr-import-dialog.ui
 gcr/gcr-certificate-basics-widget.ui