dbus: fix rebuild for boards where /var/lib isn't a symlink

Based on patch by Sagaert Johan <sagaert.johan@skynet.be>

Dbus rebuilds fails if /var/lib/dbus is a symlink (which it will be),
and the existing workaround only worked if /var/lib is a symlink to
/tmp, which isn't always the case.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/CHANGES b/CHANGES
index a3d65337f7dc08e359e1cfc1c23303a73fb335ae..cf623e35dc5d6feba83aa6df216e599e9f7b2c18 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,6 @@
 2009.11, Not released yet:
 
-       Updated/fixed packages: gvfs
+       Updated/fixed packages: dbus, gvfs
 
 2009.11-rc1, Released November 23rd, 2009:
 

diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk
index 158aeb571db9de5b10ae69a3f8c276afc3156ca4..eb97e767deaa9f1d3b2de2decc7f0d7b2fb4ff19 100644 (file)
--- a/package/dbus/dbus.mk
+++ b/package/dbus/dbus.mk
@@ -51,9 +51,9 @@ endif
 
 $(eval $(call AUTOTARGETS,package,dbus))
 
-# fix rebuild if /var/lib is a symlink to /tmp
+# fix rebuild (dbus makefile errors out if /var/lib/dbus is a symlink)
 $(DBUS_HOOK_POST_BUILD): $(DBUS_TARGET_BUILD)
-       rm -rf /tmp/dbus
+       rm -rf $(TARGET_DIR)/var/lib/dbus
        touch $@
 
 $(DBUS_HOOK_POST_INSTALL): $(DBUS_TARGET_INSTALL_TARGET)