From 4311f0fe39bdbd4648f74ff59efefa466549a9b5 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 17 Mar 2009 13:48:15 +0000
Subject: package: fix host path

And generate dbus introspect xml for dbus-glib.
---
 package/dbus/dbus.mk | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'package/dbus')

diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk
index 9d43ab2a4..4c047012c 100644
--- a/package/dbus/dbus.mk
+++ b/package/dbus/dbus.mk
@@ -57,6 +57,7 @@ $(DBUS_HOOK_POST_INSTALL): $(DBUS_TARGET_INSTALL_TARGET)
 # dbus for the host
 DBUS_HOST_DIR:=$(BUILD_DIR)/dbus-$(DBUS_VERSION)-host
 DBUS_HOST_BINARY:=$(HOST_DIR)/usr/bin/dbus-daemon
+DBUS_HOST_INTROSPECT:=$(DBUS_HOST_DIR)/introspect.xml
 
 $(DBUS_HOST_DIR)/.unpacked: $(DL_DIR)/$(DBUS_SOURCE)
 	mkdir -p $(@D)
@@ -87,18 +88,22 @@ $(DBUS_HOST_DIR)/.configured: $(DBUS_HOST_DIR)/.unpacked $(EXPAT_HOST_BINARY)
 	touch $@
 
 $(DBUS_HOST_DIR)/.compiled: $(DBUS_HOST_DIR)/.configured
-	$(MAKE) -C $(@D)
+	$(HOST_MAKE_ENV) $(MAKE) -C $(@D)
 	touch $@
 
 $(DBUS_HOST_BINARY): $(DBUS_HOST_DIR)/.compiled
 	$(MAKE) -C $(<D) install
 
-host-dbus: $(DBUS_HOST_BINARY)
+$(DBUS_HOST_INTROSPECT): $(DBUS_HOST_BINARY)
+	$(DBUS_HOST_BINARY) --introspect > $@
+
+host-dbus: $(DBUS_HOST_INTROSPECT)
 
 host-dbus-source: dbus-source
 
 host-dbus-clean:
 	rm -f $(addprefix $(DBUS_HOST_DIR)/,.unpacked .configured .compiled)
+	rm -f $(DBUS_HOST_INTROSPECT)
 	$(MAKE) -C $(DBUS_HOST_DIR) uninstall
 	$(MAKE) -C $(DBUS_HOST_DIR) clean
 
-- 
cgit v1.2.3