summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Walters <walters@verbum.org>2011-03-13 17:21:59 -0400
committerColin Walters <walters@verbum.org>2011-03-15 14:22:24 -0400
commit156d3ee427cf225bddcbf3e2ab6786ffc33bde4e (patch)
tree5dbaae66bfc093748871ec919bd02a5360e951e3
parent77833945e29b274c819ffc9d3443e4a4069d6d2e (diff)
downloadat-spi2-core-156d3ee427cf225bddcbf3e2ab6786ffc33bde4e.tar.gz
bus: Move to libexecdir
No point polluting bindir with private binaries. https://bugzilla.gnome.org/show_bug.cgi?id=644674
-rw-r--r--bus/Makefile.am8
-rw-r--r--bus/at-spi-dbus-bus.desktop.in (renamed from bus/at-spi-dbus-bus.desktop)2
2 files changed, 7 insertions, 3 deletions
diff --git a/bus/Makefile.am b/bus/Makefile.am
index bac22816..1f5a7d11 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
index f3586fb9..82904784 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