[packages] make libintl and libiconv stub/full implementations switchable, use the...

[openwrt/svn-archive/archive.git] / lang / pygtk / Makefile

diff --git a/lang/pygtk/Makefile b/lang/pygtk/Makefile
index 1ccad1ef561b538b49dda98f94201172e2cb6fb0..961818224eb2186464b10a84e39028820a2dfc97 100644 (file)
--- a/lang/pygtk/Makefile
+++ b/lang/pygtk/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2008 OpenWrt.org
+# Copyright (C) 2008-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pygtk
 PKG_VERSION:=2.12.1
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@GNOME/$(PKG_NAME)/2.12/
@@ -17,15 +17,8 @@ PKG_MD5SUM:=a816346d750d61e3fa67a200e4292694
 PKG_FIXUP:=libtool
 
 include $(INCLUDE_DIR)/package.mk
--include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk)
-
-EXTRA_CFLAGS+= \
-       -I$(STAGING_DIR)/usr/lib/libintl/include/ \
-       -I$(STAGING_DIR)/usr/lib/libiconv/include/
-
-EXTRA_LDFLAGS+= \
-       -L$(STAGING_DIR)/usr/lib/libintl/lib \
-       -L$(STAGING_DIR)/usr/lib/libiconv/lib
+include $(INCLUDE_DIR)/nls.mk
+$(call include_mk, python-package.mk)
 
 define Package/python-gtk
   SUBMENU:=Python
@@ -85,7 +78,7 @@ define Package/python-gtk/install
 
        $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)/gtk-2.0/gtk
        $(INSTALL_DATA) \
-               $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/gtk-2.0/gtk/*.{py,so} \
+               $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/gtk-2.0/gtk/*{.py,.so}* \
                $(1)$(PYTHON_PKG_DIR)/gtk-2.0/gtk
 endef