summaryrefslogtreecommitdiffstats
path: root/package/pkg-cmake.mk
diff options
context:
space:
mode:
authorThomas De Schampheleire <patrickdepinguin@gmail.com>2014-09-27 21:32:41 +0200
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2014-10-04 18:49:36 +0200
commitd6c32da8816fb7c520ccf6d5780eca96d0556183 (patch)
tree64b3c7c45ae992f7f1127bfd44a2c9b433045c84 /package/pkg-cmake.mk
parent57f2b8d2558ca47ffad01f3eadd245dd893e8154 (diff)
downloadbuildroot-d6c32da8816fb7c520ccf6d5780eca96d0556183.tar.gz
buildroot-d6c32da8816fb7c520ccf6d5780eca96d0556183.zip
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-cmake.mk')
-rw-r--r--package/pkg-cmake.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk
index 2f0469ce0a..8e6a573835 100644
--- a/package/pkg-cmake.mk
+++ b/package/pkg-cmake.mk
@@ -42,7 +42,7 @@ $(2)_MAKE ?= $$(MAKE)
$(2)_MAKE_ENV ?=
$(2)_MAKE_OPTS ?=
$(2)_INSTALL_HOST_OPT ?= install
-$(2)_INSTALL_STAGING_OPT ?= DESTDIR=$$(STAGING_DIR) install
+$(2)_INSTALL_STAGING_OPTS ?= DESTDIR=$$(STAGING_DIR) install
$(2)_INSTALL_TARGET_OPTS ?= DESTDIR=$$(TARGET_DIR) install
$(2)_SRCDIR = $$($(2)_DIR)/$$($(2)_SUBDIR)
@@ -136,7 +136,7 @@ endif
#
ifndef $(2)_INSTALL_STAGING_CMDS
define $(2)_INSTALL_STAGING_CMDS
- $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_STAGING_OPT) -C $$($$(PKG)_BUILDDIR)
+ $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_STAGING_OPTS) -C $$($$(PKG)_BUILDDIR)
endef
endif
OpenPOWER on IntegriCloud