gnome-keyring r1710 - in trunk: . daemon

[stefw svn gnome org]

Author: stefw
Date: Thu Apr  2 03:57:19 2009
New Revision: 1710
URL: http://svn.gnome.org/viewvc/gnome-keyring?rev=1710&view=rev

Log:
Include the full path to gnome-keyring-daemon in the DBus service file.

Fixes problems with autostarting daemon. See bug #576630

Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/daemon/Makefile.am
   trunk/daemon/org.gnome.keyring.service.in

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Thu Apr  2 03:57:19 2009
@@ -494,7 +494,7 @@
 	VALGRIND_RUN="$VALGRIND $VALGRIND_ARG "
 
 	AC_DEFINE_UNQUOTED(VALGRIND, "$VALGRIND", [Path to valgrind executable])
-	AC_DEFINE_UNQUOTED(VALGRIND_ARG, "$VALGRIND_ARG", [Path to valgrind executable])
+	AC_DEFINE_UNQUOTED(VALGRIND_ARG, "$VALGRIND_ARG", [Valgrind arguments])
 	
 	enable_valgrind="yes"
 	valgrind_status="run"
@@ -545,7 +545,6 @@
 common/tests/Makefile
 daemon/Makefile
 daemon/gnome-keyring-daemon.desktop.in
-daemon/org.gnome.keyring.service
 daemon/data/Makefile
 daemon/keyrings/Makefile
 daemon/keyrings/tests/Makefile

Modified: trunk/daemon/Makefile.am
==============================================================================
--- trunk/daemon/Makefile.am	(original)
+++ trunk/daemon/Makefile.am	Thu Apr  2 03:57:19 2009
@@ -60,6 +60,11 @@
 servicedir       = $(DBUS_SERVICES_DIR)
 service_in_files = org.gnome.keyring.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_DATA): $(service_in_files) Makefile
+	@sed -e "s|\ PATH\@|$(service_PATH)|" $< > $@
 
 desktop_in_files = gnome-keyring-daemon.desktop.in
 desktopdir       = $(sysconfdir)/xdg/autostart

Modified: trunk/daemon/org.gnome.keyring.service.in
==============================================================================
--- trunk/daemon/org.gnome.keyring.service.in	(original)
+++ trunk/daemon/org.gnome.keyring.service.in	Thu Apr  2 03:57:19 2009
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.gnome.keyring
-Exec= VALGRIND_RUN@ gnome-keyring-daemon --foreground --components=keyring
+Exec= PATH@/gnome-keyring-daemon --foreground --components=keyring