From 0fa9e71d30c57fb21a7261fea7112cf41b66ed78 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 23 Nov 2007 11:42:59 +0000 Subject: [PATCH] Fix target install, install helper programs as well as strip executables --- package/dbus/dbus.mk | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk index bb278e5ef9..97ff156703 100644 --- a/package/dbus/dbus.mk +++ b/package/dbus/dbus.mk @@ -66,19 +66,17 @@ $(STAGING_DIR)/usr/lib/libdbus-1.so: $(DBUS_DIR)/$(DBUS_BINARY) $(TARGET_DIR)/$(DBUS_TARGET_BINARY): $(STAGING_DIR)/usr/lib/libdbus-1.so mkdir -p $(TARGET_DIR)/var/run/dbus $(TARGET_DIR)/etc/init.d - $(MAKE) DESTDIR=$(TARGET_DIR) -C $(DBUS_DIR)/dbus install - rm -rf $(TARGET_DIR)/usr/lib/dbus-1.0 - rm -f $(TARGET_DIR)/usr/lib/libdbus-1.la \ - $(TARGET_DIR)/usr/lib/libdbus-1.so - -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libdbus-1.so.3.3.0 - $(MAKE) DESTDIR=$(TARGET_DIR) initddir=/etc/init.d -C $(DBUS_DIR)/bus install + $(MAKE) DESTDIR=$(TARGET_DIR) STRIPPROG='$(STRIP)' \ + initdir=/etc/init.d -C $(DBUS_DIR)/dbus install-strip + rm -rf $(TARGET_DIR)/usr/lib/dbus-1.0 \ + $(TARGET_DIR)/usr/lib/libdbus-1.la \ + $(TARGET_DIR)/usr/include/dbus-1.0 \ + $(TARGET_DIR)/usr/lib/pkgconfig $(INSTALL) -m 0755 package/dbus/S97messagebus $(TARGET_DIR)/etc/init.d rm -f $(TARGET_DIR)/etc/init.d/messagebus ifneq ($(BR2_HAVE_MANPAGES),y) rm -rf $(TARGET_DIR)/usr/share/man endif - rmdir --ignore-fail-on-non-empty $(TARGET_DIR)/usr/share - rm -rf $(TARGET_DIR)/etc/rc.d dbus: uclibc $(DBUS_XML_DEP) $(TARGET_DIR)/$(DBUS_TARGET_BINARY) -- 2.30.2