[packages] php-pear: use the package-specific url

[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 8012543621bc13faf5c5a3dbb0ab74a0f03a41fc..addb4097672eebe362fca233c318b13645d6d32c 100644 (file)
--- a/lang/python-gnome-desktop2/Makefile
+++ b/lang/python-gnome-desktop2/Makefile
@@ -12,19 +12,17 @@ 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
 
 EXTRA_CFLAGS += \
        -I$(STAGING_DIR)/usr/lib/libintl/include \
        -I$(STAGING_DIR)/usr/lib/libiconv/include \
-       $(if CONFIG_PACKAGE_python-rsvg,-I$(STAGING_DIR)/usr/include/librsvg-2,) \
-       $(if CONFIG_PACKAGE_python-wnck,-I$(STAGING_DIR)/usr/include/libwnck-1.0,)
 
 EXTRA_LDFLAGS += \
        -L$(STAGING_DIR)/usr/lib/libintl/lib \
@@ -38,11 +36,11 @@ 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
-       $(call Package/python-gnome-desktop/Default,librsvg,+librsvg)
+       $(call Package/python-gnome-desktop/Default,librsvg,+librsvg +pycairo)
 endef
 
 define Package/python-wnck
@@ -51,33 +49,31 @@ 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