diff options
| author | Steven Barth <steven@midlink.org> | 2015-01-06 15:17:35 +0100 |
|---|---|---|
| committer | Steven Barth <steven@midlink.org> | 2015-01-06 15:17:35 +0100 |
| commit | 6b9343abcabb1c66ee9829682b35e4c80edde532 (patch) | |
| tree | 17ad101ee7de6b58743416823e611b4ad440a5f9 /lang/python/files/python-package.mk | |
| parent | c04f69d52785138e67ca0e1bf469368b1fe4b7f3 (diff) | |
| parent | 8b86c1528afe73e858596b248fef4bc5a64da321 (diff) | |
Merge pull request #740 from commodo/python-only-cleanups
Python Cleanups
Diffstat (limited to 'lang/python/files/python-package.mk')
| -rw-r--r-- | lang/python/files/python-package.mk | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/lang/python/files/python-package.mk b/lang/python/files/python-package.mk index 3a71d09b4..d9e8df9c4 100644 --- a/lang/python/files/python-package.mk +++ b/lang/python/files/python-package.mk @@ -20,8 +20,7 @@ PYTHON:=python$(PYTHON_VERSION) 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) +PYTHONPATH:=$(PYTHON_LIB_DIR):$(STAGING_DIR)/$(PYTHON_PKG_DIR):$(PKG_INSTALL_DIR)/$(PYTHON_PKG_DIR) define HostPython ( export PYTHONPATH="$(PYTHONPATH)"; \ export PYTHONOPTIMIZE=""; \ @@ -39,6 +38,14 @@ ifdef CONFIG_USE_MIPS16 endif define PyPackage + + # Add default PyPackage filespec none defined + ifndef PyPackage/$(1)/filespec + define PyPackage/$(1)/filespec + +|$(PYTHON_PKG_DIR) + endef + endif + $(call shexport,PyPackage/$(1)/filespec) define Package/$(1)/install @@ -46,6 +53,7 @@ define PyPackage @echo "$$$$$$$$$$(call shvar,PyPackage/$(1)/filespec)" | ( \ IFS='|'; \ while read fop fspec fperm; do \ + fop=`echo "$$$$$$$$fop" | tr -d ' \t\n'`; \ if [ "$$$$$$$$fop" = "+" ]; then \ if [ ! -e "$(PKG_INSTALL_DIR)$$$$$$$$fspec" ]; then \ echo "File not found '$(PKG_INSTALL_DIR)$$$$$$$$fspec'"; \ @@ -98,3 +106,4 @@ define Build/Compile/PyMod ) find $(PKG_INSTALL_DIR) -name "*\.pyc" -o -name "*\.pyo" | xargs rm -f endef + |