From: Felix Fietkau <nbd@openwrt.org>
Date: Wed, 24 Oct 2007 15:58:19 +0000 (+0000)
Subject: fix up downloading in python packages
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f44dd137b2df784a3b6ef8796d1999d6061fdc4b;p=openwrt%2Fsvn-archive%2Fpackages.git

fix up downloading in python packages

SVN-Revision: 9427
---

diff --git a/lang/egenix-mx/Makefile b/lang/egenix-mx/Makefile
index 2c9e0b1f1..3f894eef4 100644
--- 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 19aa6ecc2..139cbad5e 100644
--- 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 a1fdb491a..a1f32248f 100644
--- 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 63e1fd1b8..0a48e49d0 100644
--- 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 868643bb6..2375f6faa 100644
--- 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 46adf696b..ba7933f34 100644
--- 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 bade7b323..e9431198e 100644
--- 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 799e826ff..6cab30276 100644
--- 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 851fe9f14..8ba814914 100644
--- 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 74d2c9800..537ee20e1 100644
--- 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 a376aeaa2..25035d9d0 100644
--- 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