dbus: fix target installation with BR2_HAVE_DEVFILES

Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/CHANGES b/CHANGES
index 2fc503e7659e9216cbb09af23a767ed280bd7c3d..207695090e95f4dffe5b8211ede693fe41990af5 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -5,7 +5,7 @@
        New packages: libcdaudio, libdvdnav, libdvdread, hostapd, tcpreplay
 
        Updated/fixed packages: at, autoconf, bash, bind, binutils, bootutils,
-       busybox, directfb, dnsmasq, e2fsprogs, gstreamer, gperf,
+       busybox, dbus, directfb, dnsmasq, e2fsprogs, gstreamer, gperf,
        gst-plugins-bad, gvfs, flex, hal, iptables, iw, jpeg, kismet, libfuse,
        libglib2, libpcap, libungif, libxml2, libxslt, lighttpd, mesa, mpg123,
        mtd-utils, neon, netstat-nat, openvpn, pcre, qt, readline, rpm,

diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk
index 276009c633ce33e931e90144d7e981c4d0d75df4..a97fc02bcd9acab44e0b63330b9e4825ca9b5a7c 100644 (file)
--- a/package/dbus/dbus.mk
+++ b/package/dbus/dbus.mk
@@ -81,7 +81,9 @@ $(DBUS_HOOK_POST_BUILD): $(DBUS_TARGET_BUILD)
        touch $@
 
 $(DBUS_HOOK_POST_INSTALL): $(DBUS_TARGET_INSTALL_TARGET)
+ifneq ($(BR2_HAVE_DEVFILES),y)
        rm -rf $(TARGET_DIR)/usr/lib/dbus-1.0
+endif
        rm -rf $(TARGET_DIR)/var/lib/dbus
        ln -sf /tmp/dbus $(TARGET_DIR)/var/lib/dbus
        $(INSTALL) -m 0755 package/dbus/S30dbus $(TARGET_DIR)/etc/init.d