[patch-team] - Upgrade ruby to 1.9.2-p0 - corrects file clashes between ruby-readline...

[openwrt/svn-archive/archive.git] / lang / python-gnome-desktop2 / Makefile

diff --git a/lang/python-gnome-desktop2/Makefile b/lang/python-gnome-desktop2/Makefile
index b02876cc63c6bbe1ca63ad9a7478c4a87837acce..1162c3285ece32af141af88a6e06ee417b5525d2 100644 (file)
--- a/lang/python-gnome-desktop2/Makefile
+++ b/lang/python-gnome-desktop2/Makefile
@@ -4,7 +4,6 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
@@ -13,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
 
@@ -37,7 +36,7 @@ define Package/python-gnome-desktop/Default
   CATEGORY:=Languages
   TITLE:=$(1) python bindings
   URL:=http://ftp.gnome.org/
-  DEPENDS:=python-core $(2)
+  DEPENDS:=+python-mini python-gtk $(2)
 endef
 
 define Package/python-rsvg
@@ -45,38 +44,36 @@ 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
        $(call Build/Configure/Default, \
-               $(if, $(CONFIG_PACKGE_python-rsvg), --enable-rsvg, --disable-rsvg), \
-               $(if, $(CONFIG_PACKGE_python-wnck), --enable-wnck, --disable-wnck), \
+               $(if $(CONFIG_PACKAGE_python-rsvg), --enable-rsvg, --disable-rsvg) \
+               $(if $(CONFIG_PACKAGE_python-wnck), --enable-wnck, --disable-wnck) \
        )
 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