[at-spi2-core] Tweak the at-spi-dbus-bus.desktop file to add @bindir@ and X-GNOME-Autostart-Phase

[William Walker <wwalker src gnome org>]

commit 8037fd0dbcbeea069f3541e52d6e95ec18017038
Author: Willie Walker <william walker sun com>
Date:   Wed Jan 20 11:23:21 2010 -0500

    Tweak the at-spi-dbus-bus.desktop file to add @bindir@ and X-GNOME-Autostart-Phase

 .gitignore                                         |    1 -
 bus/Makefile.am                                    |    8 +++++++-
 ...dbus-bus.desktop => at-spi-dbus-bus.desktop.in} |    6 ++++--
 3 files changed, 11 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e8ebeab..c8ee8f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-*.in
 *Makefile
 ChangeLog
 *.pyc
diff --git a/bus/Makefile.am b/bus/Makefile.am
index e5b6fab..9f0b5d4 100644
--- a/bus/Makefile.am
+++ b/bus/Makefile.am
@@ -11,4 +11,10 @@ default_session_DATA = at-spi-dbus-bus.desktop
 
 EXTRA_DIST= \
             accessibility.conf \
-            at-spi-dbus-bus.desktop
+            at-spi-dbus-bus.desktop.in
+
+%.desktop: %.desktop.in Makefile.am
+	sed -e "s,\ bindir\@,$(EXPANDED_BINDIR)," < $< > $@
+
+CLEANFILES= \
+	at-spi-dbus-bus.desktop
diff --git a/bus/at-spi-dbus-bus.desktop b/bus/at-spi-dbus-bus.desktop.in
similarity index 52%
rename from bus/at-spi-dbus-bus.desktop
rename to bus/at-spi-dbus-bus.desktop.in
index b5f8622..1f33928 100644
--- a/bus/at-spi-dbus-bus.desktop
+++ b/bus/at-spi-dbus-bus.desktop.in
@@ -1,7 +1,9 @@
 [Desktop Entry]
 Type=Application
-_Name=AT SPI D-Bus Bus
-Exec=at-spi-dbus-bus
+Name=AT SPI D-Bus Bus
+Exec= bindir@/at-spi-dbus-bus
 OnlyShowIn=GNOME;
 NoDisplay=true
 AutostartCondition=GNOME /desktop/gnome/interface/accessibility
+X-GNOME-AutoRestart=true
+X-GNOME-Autostart-Phase=Initialization