lede-packages-rs

commit 81545ba2814eb23f4fda78565f2d2de892c8ad18
parent 44180b642916f6a6ef6c267c7d7c95567266e7ea
Author: Steven Barth <steven@midlink.org>
Date:   Tue,  9 Dec 2014 12:38:09 +0100

Merge pull request #619 from commodo/python-cleanup

Python cleanup
Diffstat:
M
lang/python-pip/Makefile
 | 
2
--
M
lang/python-setuptools/Makefile
 | 
2
--
M
lang/python/files/python-package.mk
 | 
2
++

3 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/lang/python-pip/Makefile b/lang/python-pip/Makefile
@@ -34,9 +34,7 @@ define Package/python-pip/description
   A tool for installing and managing Python packages.
 endef
 
-PYTHONPATH:=$(PKG_INSTALL_DIR)/$(PYTHON_PKG_DIR)
 define Build/Compile
-	$(INSTALL_DIR) $(PYTHONPATH)
 	$(call Build/Compile/PyMod,,\
 		install --prefix="$(PKG_INSTALL_DIR)/usr" \
 	)
diff --git a/lang/python-setuptools/Makefile b/lang/python-setuptools/Makefile
@@ -33,9 +33,7 @@ define Package/python-setuptools/description
   Easily download, build, install, upgrade, and uninstall Python packages
 endef
 
-PYTHONPATH:=$(PKG_INSTALL_DIR)/$(PYTHON_PKG_DIR)
 define Build/Compile
-	$(INSTALL_DIR) $(PYTHONPATH)
 	$(call Build/Compile/PyMod,,\
 		install --prefix="$(PKG_INSTALL_DIR)/usr" \
 	)
diff --git a/lang/python/files/python-package.mk b/lang/python/files/python-package.mk
@@ -21,6 +21,7 @@ HOST_PYTHON_LIB_DIR:=$(STAGING_DIR_HOST)/lib/python$(PYTHON_VERSION)
 HOST_PYTHON_BIN:=$(STAGING_DIR_HOST)/bin/python2
 
 PYTHONPATH:=$(PYTHON_LIB_DIR):$(STAGING_DIR)/$(PYTHON_PKG_DIR)
+PYTHONPATH+=:$(PKG_INSTALL_DIR)/$(PYTHON_PKG_DIR)
 define HostPython
 	(	export PYTHONPATH="$(PYTHONPATH)"; \
 		export PYTHONOPTIMIZE=""; \
@@ -79,6 +80,7 @@ endef
 # $(2) => additional arguments to setup.py
 # $(3) => additional variables
 define Build/Compile/PyMod
+	$(INSTALL_DIR) $(PKG_INSTALL_DIR)/$(PYTHON_PKG_DIR)
 	$(call HostPython, \
 		cd $(PKG_BUILD_DIR)/$(strip $(1)); \
 		CC="$(TARGET_CC)" \