[at-spi2-core] bus: Move to libexecdir



commit 156d3ee427cf225bddcbf3e2ab6786ffc33bde4e
Author: Colin Walters <walters verbum org>
Date:   Sun Mar 13 17:21:59 2011 -0400

    bus: Move to libexecdir
    
    No point polluting bindir with private binaries.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=644674

 bus/Makefile.am                                    |    8 ++++++--
 ...dbus-bus.desktop => at-spi-dbus-bus.desktop.in} |    2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/bus/Makefile.am b/bus/Makefile.am
index bac2281..1f5a7d1 100644
--- a/bus/Makefile.am
+++ b/bus/Makefile.am
@@ -1,16 +1,20 @@
 busconfigdir = $(sysconfdir)/at-spi2
 busconfig_DATA = accessibility.conf
 
-atspidbusdir = $(bindir)
+atspidbusdir = $(libexecdir)
 atspidbus_SCRIPTS = at-spi-dbus-bus
 
 default_sessiondir = $(sysconfdir)/xdg/autostart
 default_session_DATA = at-spi-dbus-bus.desktop
 
+at-spi-dbus-bus.desktop: at-spi-dbus-bus.desktop.in
+	sed -e "s,@libexecdir[ ],$(libexecdir)," $< > $  tmp && mv $  tmp $@
+
 EXTRA_DIST= \
 	accessibility.conf \
 	at-spi-dbus-bus.in \
-	at-spi-dbus-bus.desktop
+	at-spi-dbus-bus.desktop.in
 
 CLEANFILES= \
+	at-spi-dbus-bus.desktop \
 	at-spi-dbus-bus
diff --git a/bus/at-spi-dbus-bus.desktop b/bus/at-spi-dbus-bus.desktop.in
similarity index 87%
rename from bus/at-spi-dbus-bus.desktop
rename to bus/at-spi-dbus-bus.desktop.in
index f3586fb..8290478 100644
--- a/bus/at-spi-dbus-bus.desktop
+++ b/bus/at-spi-dbus-bus.desktop.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=AT SPI D-Bus Bus
-Exec=at-spi-dbus-bus
+Exec= libexecdir@/at-spi-dbus-bus
 OnlyShowIn=GNOME;
 NoDisplay=true
 AutostartCondition=GSETTINGS org.gnome.desktop.interface toolkit-accessibility



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]