X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=lang%2Fpysqlite%2FMakefile;h=1c77bbc7d744cb1c95f46a0ff9ffd471d5dc7ed8;hb=18441d2b0af579e3082a1dc3df3a402f10dc78df;hp=b5896150faafa2461ba64d5cf72a773fc38d3842;hpb=44d71eade23c229ef6be6b29b263cbb547aed566;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/lang/pysqlite/Makefile b/lang/pysqlite/Makefile
index b5896150fa..1c77bbc7d7 100644
--- a/lang/pysqlite/Makefile
+++ b/lang/pysqlite/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
 
@@ -19,7 +18,7 @@ PKG_MD5SUM:=b4a185e936848370fcc1a5b17755b641
 PKG_BUILD_DEPENDS:=python
 
 include $(INCLUDE_DIR)/package.mk
--include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk)
+$(call include_mk, python-package.mk)
 
 define Package/python-sqlite
  SUBMENU:=Python
@@ -27,7 +26,7 @@ define Package/python-sqlite
  CATEGORY:=Languages
  TITLE:=SQLite database adapter for Python
  URL:=http://www.initd.org/tracker/pysqlite/wiki/pysqlite
- DEPENDS:=python-core +libsqlite3
+ DEPENDS:=+python-mini +libsqlite3
 endef
 
 define Package/python-sqlite/description
@@ -40,6 +39,14 @@ define PyPackage/python-sqlite/filespec
 -|$(PYTHON_PKG_DIR)/pysqlite2/test
 endef
 
+define Build/Configure
+	cp ./files/setup.cfg.in $(PKG_BUILD_DIR)/setup.cfg
+	$(SED) \
+		's,@INCLUDE_DIRS@,$(STAGING_DIR)/usr/include,g' \
+		-e 's,@INCLUDE_DIRS@,$(STAGING_DIR)/usr/include,g' \
+		$(PKG_BUILD_DIR)/setup.cfg
+endef
+
 define Build/Compile
 	$(if $(Build/Compile/PyMod),,@echo Python packaging code not found.; false)
 	$(call Build/Compile/PyMod,., \
@@ -49,7 +56,3 @@ endef
 
 $(eval $(call PyPackage,python-sqlite))
 $(eval $(call BuildPackage,python-sqlite))
-
-$(eval $(call RequireHeader,/usr/include/gnu/stubs-32.h, \
-	$(PKG_NAME) requires a 32-bits toolchain. \
-))