diff options
| author | Thomas De Schampheleire <patrickdepinguin@gmail.com> | 2014-09-27 21:32:41 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2014-10-04 18:49:36 +0200 |
| commit | d6c32da8816fb7c520ccf6d5780eca96d0556183 (patch) | |
| tree | 64b3c7c45ae992f7f1127bfd44a2c9b433045c84 /package/pkg-python.mk | |
| parent | 57f2b8d2558ca47ffad01f3eadd245dd893e8154 (diff) | |
packages: rename FOO_INSTALL_STAGING_OPT into FOO_INSTALL_STAGING_OPTS
To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS,
make the same change for FOO_INSTALL_STAGING_OPT.
Sed command used:
find * -type f | xargs sed -i 's#_INSTALL_STAGING_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 0dd56d9ab..af17f7f6d 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -38,7 +38,7 @@ PKG_PYTHON_DISTUTILS_BUILD_OPT = \ PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS = \ --prefix=$(TARGET_DIR)/usr -PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPT = \ +PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS = \ --prefix=$(STAGING_DIR)/usr # Host distutils-based packages @@ -62,7 +62,7 @@ PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS = \ --single-version-externally-managed \ --root=/ -PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPT = \ +PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS = \ --prefix=$(STAGING_DIR)/usr \ --executable=/usr/bin/python \ --single-version-externally-managed \ @@ -113,7 +113,7 @@ $(2)_BASE_ENV = $$(PKG_PYTHON_DISTUTILS_ENV) $(2)_BASE_BUILD_TGT = build $(2)_BASE_BUILD_OPT = $$(PKG_PYTHON_DISTUTILS_BUILD_OPT) $(2)_BASE_INSTALL_TARGET_OPTS = $$(PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS) -$(2)_BASE_INSTALL_STAGING_OPT = $$(PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPT) +$(2)_BASE_INSTALL_STAGING_OPTS = $$(PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS) else $(2)_BASE_ENV = $$(HOST_PKG_PYTHON_DISTUTILS_ENV) $(2)_BASE_BUILD_TGT = build @@ -127,7 +127,7 @@ $(2)_BASE_ENV = $$(PKG_PYTHON_SETUPTOOLS_ENV) $(2)_BASE_BUILD_TGT = build $(2)_BASE_BUILD_OPT = $(2)_BASE_INSTALL_TARGET_OPTS = $$(PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS) -$(2)_BASE_INSTALL_STAGING_OPT = $$(PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPT) +$(2)_BASE_INSTALL_STAGING_OPTS = $$(PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS) else $(2)_BASE_ENV = $$(HOST_PKG_PYTHON_SETUPTOOLS_ENV) $(2)_BASE_BUILD_TGT = build @@ -268,8 +268,8 @@ define $(2)_INSTALL_STAGING_CMDS (cd $$($$(PKG)_BUILDDIR)/; \ $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ $$($(2)_PYTHON_INTERPRETER) setup.py install \ - $$($$(PKG)_BASE_INSTALL_STAGING_OPT) \ - $$($$(PKG)_INSTALL_STAGING_OPT)) + $$($$(PKG)_BASE_INSTALL_STAGING_OPTS) \ + $$($$(PKG)_INSTALL_STAGING_OPTS)) endef endif |