fix up downloading in python packages

git-svn-id: svn://svn.openwrt.org/openwrt/packages@9427 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/lang/egenix-mx/Makefile b/lang/egenix-mx/Makefile
index 2c9e0b1..3f894ee 100644 (file)
--- a/lang/egenix-mx/Makefile
+++ b/lang/egenix-mx/Makefile
@@ -21,8 +21,8 @@ PKG_BUILD_DEPENDS:=python
 
 include $(INCLUDE_DIR)/package.mk
 -include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk)
-ifeq ($(DUMP)$(Build/Compile/PyMod),)
-  $(error Python packaging code not found.)
+ifneq ($(MAKECMDGOALS),download)
+  $(if $(DUMP)$(Build/Compile/PyMod),,$(error Python packaging code not found.))
 endif
 
 define Package/python-egenix-mx

diff --git a/lang/kid/Makefile b/lang/kid/Makefile
index 19aa6ec..139cbad 100644 (file)
--- a/lang/kid/Makefile
+++ b/lang/kid/Makefile
@@ -19,8 +19,8 @@ PKG_BUILD_DEPENDS:=python
 
 include $(INCLUDE_DIR)/package.mk
 -include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk)
-ifeq ($(DUMP)$(Build/Compile/PyMod),)
-  $(error Python packaging code not found.)
+ifneq ($(MAKECMDGOALS),download)
+  $(if $(DUMP)$(Build/Compile/PyMod),,$(error Python packaging code not found.))
 endif
 
 define Package/python-kid

diff --git a/lang/psycopg/Makefile b/lang/psycopg/Makefile
index a1fdb49..a1f3224 100644 (file)
--- a/lang/psycopg/Makefile
+++ b/lang/psycopg/Makefile
@@ -19,8 +19,8 @@ PKG_BUILD_DEPENDS:=python
 
 include $(INCLUDE_DIR)/package.mk
 -include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk)
-ifeq ($(DUMP)$(Build/Compile/PyMod),)
-  $(error Python packaging code not found.)
+ifneq ($(MAKECMDGOALS),download)
+  $(if $(DUMP)$(Build/Compile/PyMod),,$(error Python packaging code not found.))
 endif
 
 define Package/python-psycopg

diff --git a/lang/pyevent/Makefile b/lang/pyevent/Makefile
index 63e1fd1..0a48e49 100644 (file)
--- a/lang/pyevent/Makefile
+++ b/lang/pyevent/Makefile
@@ -19,8 +19,8 @@ PKG_BUILD_DEPENDS:=python
 
 include $(INCLUDE_DIR)/package.mk
 -include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk)
-ifeq ($(DUMP)$(Build/Compile/PyMod),)
-  $(error Python packaging code not found.)
+ifneq ($(MAKECMDGOALS),download)
+  $(if $(DUMP)$(Build/Compile/PyMod),,$(error Python packaging code not found.))
 endif
 
 define Package/python-event

diff --git a/lang/pymysql/Makefile b/lang/pymysql/Makefile
index 868643b..2375f6f 100644 (file)
--- a/lang/pymysql/Makefile
+++ b/lang/pymysql/Makefile
@@ -19,8 +19,8 @@ PKG_BUILD_DEPENDS:=python
 
 include $(INCLUDE_DIR)/package.mk
 -include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk)
-ifeq ($(DUMP)$(Build/Compile/PyMod),)
-  $(error Python packaging code not found.)
+ifneq ($(MAKECMDGOALS),download)
+  $(if $(DUMP)$(Build/Compile/PyMod),,$(error Python packaging code not found.))
 endif
 
 define Package/python-mysql

diff --git a/lang/pypcap/Makefile b/lang/pypcap/Makefile
index 46adf69..ba7933f 100644 (file)
--- a/lang/pypcap/Makefile
+++ b/lang/pypcap/Makefile
@@ -19,8 +19,8 @@ PKG_BUILD_DEPENDS:=python
 
 include $(INCLUDE_DIR)/package.mk
 -include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk)
-ifeq ($(DUMP)$(Build/Compile/PyMod),)
-  $(error Python packaging code not found.)
+ifneq ($(MAKECMDGOALS),download)
+  $(if $(DUMP)$(Build/Compile/PyMod),,$(error Python packaging code not found.))
 endif
 
 define Package/python-pcap

diff --git a/lang/pysqlite/Makefile b/lang/pysqlite/Makefile
index bade7b3..e943119 100644 (file)
--- a/lang/pysqlite/Makefile
+++ b/lang/pysqlite/Makefile
@@ -19,8 +19,8 @@ PKG_BUILD_DEPENDS:=python
 
 include $(INCLUDE_DIR)/package.mk
 -include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk)
-ifeq ($(DUMP)$(Build/Compile/PyMod),)
-  $(error Python packaging code not found.)
+ifneq ($(MAKECMDGOALS),download)
+  $(if $(DUMP)$(Build/Compile/PyMod),,$(error Python packaging code not found.))
 endif
 
 define Package/python-sqlite

diff --git a/lang/twisted/Makefile b/lang/twisted/Makefile
index 799e826..6cab302 100644 (file)
--- a/lang/twisted/Makefile
+++ b/lang/twisted/Makefile
@@ -21,8 +21,8 @@ PKG_BUILD_DEPENDS:=python
 
 include $(INCLUDE_DIR)/package.mk
 -include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk)
-ifeq ($(DUMP)$(Build/Compile/PyMod),)
-  $(error Python packaging code not found.)
+ifneq ($(MAKECMDGOALS),download)
+  $(if $(DUMP)$(Build/Compile/PyMod),,$(error Python packaging code not found.))
 endif
 
 define Package/twisted/default

diff --git a/lang/yapsnmp/Makefile b/lang/yapsnmp/Makefile
index 851fe9f..8ba8149 100644 (file)
--- a/lang/yapsnmp/Makefile
+++ b/lang/yapsnmp/Makefile
@@ -19,8 +19,8 @@ PKG_BUILD_DEPENDS:=python
 
 include $(INCLUDE_DIR)/package.mk
 -include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk)
-ifeq ($(DUMP)$(Build/Compile/PyMod),)
-  $(error Python packaging code not found.)
+ifneq ($(MAKECMDGOALS),download)
+  $(if $(DUMP)$(Build/Compile/PyMod),,$(error Python packaging code not found.))
 endif
 
 define Package/python-yapsnmp

diff --git a/utils/rdiff-backup/Makefile b/utils/rdiff-backup/Makefile
index 74d2c98..537ee20 100644 (file)
--- a/utils/rdiff-backup/Makefile
+++ b/utils/rdiff-backup/Makefile
@@ -17,7 +17,10 @@ PKG_SOURCE_URL:=http://savannah.nongnu.org/download/rdiff-backup/
 PKG_MD5SUM:=756b38aaf2602d097cafd08996fb7887
 
 include $(INCLUDE_DIR)/package.mk
--include $(TOPDIR)/package/python/python-package.mk
+-include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk)
+ifneq ($(MAKECMDGOALS),download)
+  $(if $(DUMP)$(Build/Compile/PyMod),,$(error Python packaging code not found.))
+endif
 
 define PyPackage/rdiff-backup
   SECTION:=utils

diff --git a/utils/rrdtool/Makefile b/utils/rrdtool/Makefile
index a376aea..25035d9 100644 (file)
--- a/utils/rrdtool/Makefile
+++ b/utils/rrdtool/Makefile
@@ -19,7 +19,10 @@ PKG_MD5SUM:=dafa161bc9c61e57636a6085c87c1fe8
 PKG_BUILD_DEPENDS:=libnotimpl python-core
 
 include $(INCLUDE_DIR)/package.mk
--include $(if $(DUMP),,./python-package.mk)
+-include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk)
+ifneq ($(MAKECMDGOALS),download)
+  $(if $(DUMP)$(Build/Compile/PyMod),,$(error Python packaging code not found.))
+endif
 
 define Package/rrdtool/Default
   SECTION:=utils