From: Dan Winship <danw@gnome.org>
Date: Fri, 21 Jan 2011 17:54:27 +0000 (-0500)
Subject: Don't rebuild bus/at-spi-dbus-bus (incorrectly)
X-Git-Tag: AT_SPI2_CORE_1_91_6~21
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c864594d76ef123eec18cfd082afeef3aa93cd11;p=platform%2Fupstream%2Fat-spi2-core.git

Don't rebuild bus/at-spi-dbus-bus (incorrectly)

bus/at-spi-dbus-bus is generated by configure.in, so don't regenerate
it via a Makefile rule (especially via a Makefile rule that forgets to
substitute the correct value for @enable_relocate@)

https://bugzilla.gnome.org/show_bug.cgi?id=640209
---

diff --git a/bus/Makefile.am b/bus/Makefile.am
index bce24f3..bac2281 100644
--- a/bus/Makefile.am
+++ b/bus/Makefile.am
@@ -7,13 +7,6 @@ atspidbus_SCRIPTS = at-spi-dbus-bus
 default_sessiondir = $(sysconfdir)/xdg/autostart
 default_session_DATA = at-spi-dbus-bus.desktop
 
-do_subst = sed -e 's,[@]prefix[@],${prefix},g' \
-               -e 's,[@]sysconfdir[@],${sysconfdir},g' \
-               -e 's,[@]DBUS_DAEMON[@],@DBUS_DAEMON@,g'
-
-at-spi-dbus-bus:	at-spi-dbus-bus.in Makefile
-	$(do_subst) $(srcdir)/$@.in > $@
-
 EXTRA_DIST= \
 	accessibility.conf \
 	at-spi-dbus-bus.in \