X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=lang%2Fpython-dbus%2FMakefile;h=94d8fb30dff27f87c258d2375c72f6775918a187;hp=d93f147ba338697f82e973b65b495033c47d751a;hb=7afdced540b1406726635c55f7b3d40f1b07ae2c;hpb=019c4e27e693571513af34d06769728ee3b2cc0c

diff --git a/lang/python-dbus/Makefile b/lang/python-dbus/Makefile
index d93f147ba3..94d8fb30df 100644
--- a/lang/python-dbus/Makefile
+++ b/lang/python-dbus/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2008 OpenWrt.org
+# Copyright (C) 2008-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,19 +8,26 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dbus-python
-PKG_VERSION:=0.82.4
-PKG_RELEASE:=1
+PKG_VERSION:=0.83.0
+PKG_RELEASE:=3
+
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://dbus.freedesktop.org/releases/dbus-python/
+PKG_MD5SUM:=562c78876219bf458d79a041af18293d
+
 PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
+$(call include_mk, python-package.mk)
+
 
-EXTRA_CFLAGS += \
+TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/lib/libintl/include \
 	-I$(STAGING_DIR)/usr/lib/libiconv/include
 
-EXTRA_LDFLAGS += \
+TARGET_LDFLAGS += \
+	-Wl,-rpath=$(STAGING_DIR)/usr/lib \
 	-L$(STAGING_DIR)/usr/lib/libintl/lib \
 	-L$(STAGING_DIR)/usr/lib/libiconv/lib
 
@@ -28,38 +35,43 @@ define Package/dbus-python
   SUBMENU:=Python
   SECTION:=lang
   CATEGORY:=Languages
-  TITLE:=python bindings for dbus
+  TITLE:=Python bindings for dbus
   URL:=http://dbus.freedesktop.org/
-  DEPENDS:=+libdbus-glib
+  DEPENDS:=+python +python-expat +libdbus-glib
 endef
 
 define Package/dbus-python/description
-  python bindings for dbus 
-endef
-
-define Build/Configure
-	(cd $(PKG_BUILD_DIR); \
-		if [ -x $(CONFIGURE_CMD) ]; then \
-			$(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \
-			$(CONFIGURE_VARS) \
-			$(CONFIGURE_CMD) \
-			$(CONFIGURE_ARGS) ;\
-		fi \
-	)
-endef
-
-define Build/Compile
-	cd $(PKG_BUILD_DIR) ; DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) all install
+  Python bindings for dbus.
 endef
 
 define Build/InstallDev
-	mkdir -p $(1)
-	cp -r $(PKG_INSTALL_DIR)/* $(1)
+	$(INSTALL_DIR) $(1)/usr/include/dbus-1.0/dbus
+	$(INSTALL_DATA) \
+		$(PKG_INSTALL_DIR)/usr/include/dbus-1.0/dbus/* \
+		$(1)/usr/include/dbus-1.0/dbus/
+
+	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+	$(INSTALL_DATA) \
+		$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \
+		$(1)/usr/lib/pkgconfig
 endef
 
 define Package/dbus-python/install
-	mkdir -p $(1)
-	cp -r $(PKG_INSTALL_DIR)/* $(1)
+	$(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)
+	$(INSTALL_DATA) \
+		$(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/*.{py,so} \
+		$(1)$(PYTHON_PKG_DIR)
+
+	$(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)/dbus
+	$(INSTALL_DATA) \
+		$(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/dbus/*.py \
+		$(1)$(PYTHON_PKG_DIR)/dbus
+
+	$(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)/dbus/mainloop
+	$(INSTALL_DATA) \
+		$(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/dbus/mainloop/*.py \
+		$(1)$(PYTHON_PKG_DIR)/dbus/mainloop
+
 endef
 
 $(eval $(call BuildPackage,dbus-python))