X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=lang%2Fpython-gnome-desktop2%2FMakefile;h=1162c3285ece32af141af88a6e06ee417b5525d2;hb=e99101cf1e7266c4bcfbe8590faff27145526954;hp=35b98944a5d11ea7aea7cfef6afaad23330d1d31;hpb=31746dfb3bbcd2d9658d1f4fe234e6d09bbf4a12;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/lang/python-gnome-desktop2/Makefile b/lang/python-gnome-desktop2/Makefile
index 35b98944a5..1162c3285e 100644
--- a/lang/python-gnome-desktop2/Makefile
+++ b/lang/python-gnome-desktop2/Makefile
@@ -12,11 +12,11 @@ PKG_VERSION:=2.22.0
 PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@GNOME/$(PKG_NAME)/2.22
-PKG_MD5SUM:=504877a973f6abc0788283232cd703c
+PKG_MD5SUM:=504877a973f6abc0788283232cd703cb
 PKG_FIXUP:=libtool
 
 include $(INCLUDE_DIR)/package.mk
-include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk)
+$(call include_mk, python-package.mk)
 
 PKG_INSTALL=1
 
@@ -44,7 +44,7 @@ define Package/python-rsvg
 endef
 
 define Package/python-wnck
-	$(call Package/python-gnome-desktop/Default,libwnck,+libwnck)
+	$(call Package/python-gnome-desktop/Default,libwnck,+PACKAGE_python-wnck:libwnck)
 endef
 
 define Build/Configure
@@ -54,28 +54,26 @@ define Build/Configure
 	)
 endef
 
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/share/pygtk/2.0/defs
-	$(INSTALL_DATA) \
-		$(PKG_INSTALL_DIR)/usr/share/pygtk/2.0/defs/* \
-		$(1)/usr/share/pygtk/2.0/defs
+MAKE_INSTALL_FLAGS += \
+	PYGTK_DEFSDIR="$(PKG_INSTALL_DIR)/usr/share/pygtk/2.0/defs"
 
+define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(INSTALL_DATA) \
-		$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \
-		$(1)/usr/lib/pkgconfig
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*.pc \
+		$(1)/usr/lib/pkgconfig/
 
 	$(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)/gtk-2.0
-	$(INSTALL_DATA) \
-		$(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/gtk-2.0/*.{so,la} \
-		$(1)$(PYTHON_PKG_DIR)/gtk-2.0
+	$(CP) \
+		$(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/gtk-2.0/*.{a,la,so} \
+		$(1)$(PYTHON_PKG_DIR)/gtk-2.0/
 endef
 
 define Package/python-gnome-desktop/install/Default
 	$(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)/gtk-2.0
-	$(INSTALL_DATA) \
-		$(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/gtk-2.0/$(2).{so,a} \
-		$(1)$(PYTHON_PKG_DIR)/gtk-2.0
+	$(CP) \
+		$(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/gtk-2.0/$(2).so \
+		$(1)$(PYTHON_PKG_DIR)/gtk-2.0/
 endef
 
 define Package/python-rsvg/install