diff options
| author | Thomas De Schampheleire <patrickdepinguin@gmail.com> | 2014-09-27 21:32:39 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2014-10-04 18:47:37 +0200 |
| commit | b1993430346a8fed4607cfb565104cc33b598ea1 (patch) | |
| tree | abfcecccf845f466dd4d75a3bf3068c6e76603db /package/pkg-python.mk | |
| parent | 0518a98ac3e715a846dfb72fcfb2ec7aed423084 (diff) | |
packages: rename FOO_INSTALL_OPT into FOO_INSTALL_OPTS
To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS,
make the same change for FOO_INSTALL_OPT.
Sed command used:
find * -type f | xargs sed -i 's#_INSTALL_OPT\>#&S#g'
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/pkg-python.mk')
| -rw-r--r-- | package/pkg-python.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/package/pkg-python.mk b/package/pkg-python.mk index d49e5c231..09bc783de 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -45,7 +45,7 @@ PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPT = \ HOST_PKG_PYTHON_DISTUTILS_ENV = \ PATH=$(BR_PATH) -HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPT = \ +HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS = \ --prefix=$(HOST_DIR)/usr # Target setuptools-based packages @@ -72,7 +72,7 @@ PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPT = \ HOST_PKG_PYTHON_SETUPTOOLS_ENV = \ PATH=$(BR_PATH) -HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPT = \ +HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \ --prefix=$(HOST_DIR)/usr ################################################################################ @@ -96,7 +96,7 @@ $(2)_BUILDDIR = $$($(2)_SRCDIR) $(2)_ENV ?= $(2)_BUILD_OPT ?= -$(2)_INSTALL_OPT ?= +$(2)_INSTALL_OPTS ?= ifndef $(2)_SETUP_TYPE ifdef $(3)_SETUP_TYPE @@ -118,7 +118,7 @@ else $(2)_BASE_ENV = $$(HOST_PKG_PYTHON_DISTUTILS_ENV) $(2)_BASE_BUILD_TGT = build $(2)_BASE_BUILD_OPT = -$(2)_BASE_INSTALL_OPT = $$(HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPT) +$(2)_BASE_INSTALL_OPTS = $$(HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS) endif # Setuptools else ifeq ($$($(2)_SETUP_TYPE),setuptools) @@ -132,7 +132,7 @@ else $(2)_BASE_ENV = $$(HOST_PKG_PYTHON_SETUPTOOLS_ENV) $(2)_BASE_BUILD_TGT = build $(2)_BASE_BUILD_OPT = -$(2)_BASE_INSTALL_OPT = $$(HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPT) +$(2)_BASE_INSTALL_OPTS = $$(HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS) endif else $$(error "Invalid $(2)_SETUP_TYPE. Valid options are 'distutils' or 'setuptools'") @@ -241,7 +241,7 @@ define $(2)_INSTALL_CMDS (cd $$($$(PKG)_BUILDDIR)/; \ $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ $$($(2)_PYTHON_INTERPRETER) setup.py install \ - $$($$(PKG)_BASE_INSTALL_OPT) $$($$(PKG)_INSTALL_OPT)) + $$($$(PKG)_BASE_INSTALL_OPTS) $$($$(PKG)_INSTALL_OPTS)) endef endif |