[packages] lang: use $(CP) & $(INSTALL_DIR)

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

diff --git a/lang/numpy/Makefile b/lang/numpy/Makefile
index 217c975f96d786a8f29f7970ae3206bf0255f596..1b2915ee745bdf2c0dd7835c395c0a61a0d20dd2 100644 (file)
--- a/lang/numpy/Makefile
+++ b/lang/numpy/Makefile
@@ -1,5 +1,5 @@
 #
 #

-# Copyright (C) 2008 OpenWrt.org
+# Copyright (C) 2008-2009 OpenWrt.org

 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.


@@ -11,10 +11,11 @@ PKG_NAME:=numpy
 PKG_VERSION:=1.0.4
 PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_VERSION:=1.0.4
 PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz

-PKG_SOURCE_URL:=http://downloads.sourceforge.net/numpy/
+PKG_SOURCE_URL:=@SF/numpy

 PKG_MD5SUM:=8f011e9d7697da570efaac61c51725e0
 
 include $(INCLUDE_DIR)/package.mk
 PKG_MD5SUM:=8f011e9d7697da570efaac61c51725e0
 
 include $(INCLUDE_DIR)/package.mk

+-include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk)

 
 define Package/numpy
   SUBMENU:=Python
 
 define Package/numpy
   SUBMENU:=Python


@@ -22,7 +23,7 @@ define Package/numpy
   CATEGORY:=Languages
   TITLE:=numpy
   URL:=http://numpy.sf.net
   CATEGORY:=Languages
   TITLE:=numpy
   URL:=http://numpy.sf.net

-  DEPENDS:=python-core
+  DEPENDS:=+python-mini @TARGET_x86||TARGET_olpc||TARGET_uml @BROKEN

 endef
 
 define Package/numpy/description
 endef
 
 define Package/numpy/description


@@ -31,16 +32,13 @@ endef
 
 define Build/Compile
        cd $(PKG_BUILD_DIR) ; $(CONFIGURE_VARS) $(MAKE_VARS) python2.5 ./setup.py install --prefix="$(PKG_INSTALL_DIR)/usr"
 
 define Build/Compile
        cd $(PKG_BUILD_DIR) ; $(CONFIGURE_VARS) $(MAKE_VARS) python2.5 ./setup.py install --prefix="$(PKG_INSTALL_DIR)/usr"

-       sed -i "s/UCS4/UCS2/g" $(PKG_INSTALL_DIR)/usr/lib/python2.5/site-packages/numpy/core/multiarray.so

 endef
 
 define Package/numpy/install
 endef
 
 define Package/numpy/install

-       mkdir -p $(1)
-       cp -r $(PKG_INSTALL_DIR)/* $(1)
+       $(INSTALL_DIR) $(1)
+       $(CP) $(PKG_INSTALL_DIR)/* $(1)/

 endef
 
 endef
 

-$(eval $(call BuildPackage,numpy))
-

 define Require/python25-dev
 [ -e /usr/include/python2.5/pyconfig.h ]
 endef
 define Require/python25-dev
 [ -e /usr/include/python2.5/pyconfig.h ]
 endef


@@ -48,3 +46,6 @@ endef
 $(eval $(call Require,python25-dev, \
        Please install Python 2.5 (including development headers and libraries) \
 ))
 $(eval $(call Require,python25-dev, \
        Please install Python 2.5 (including development headers and libraries) \
 ))

+
+$(eval $(call BuildPackage,numpy))
+