aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Yann E. MORIN <yann.morin.1998@free.fr>2017-11-30 00:08:39 +0100
committerGravatar Peter Korsgaard <peter@korsgaard.com>2017-12-27 10:45:44 +0100
commit241f5078efbca85360820bc7e86d8e2cb1a148c1 (patch)
tree95a6de17e9892c59f23f38d0fda167b7355c4f9c
parent7567b9cce47dd41dd13f9d9b243e304fca10af69 (diff)
downloadbuildroot-241f5078efbca85360820bc7e86d8e2cb1a148c1.tar.gz
buildroot-241f5078efbca85360820bc7e86d8e2cb1a148c1.tar.bz2
package/checkpolicy: rename variable
We use package names as poor-man's namespace, so fix that. Reported by utils/check-package. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Adam Duskett <aduskett@gmail.com> Cc: Clayton Shotwell <clayton.shotwell@rockwellcollins.com> Cc: Matt Weber <matthew.weber@rockwellcollins.com> [Thomas: use CHECKPOLICY_MAKE_OPTS instead of CHECKPOLICY_TARGET_MAKE_OPTS, as it is more consistent with HOST_CHECKPOLICY_MAKE_OPTS being used for the host variant.] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> (cherry picked from commit d9f771b9020bda091804fdc3ff75a2d5b18a0e6c) Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/checkpolicy/checkpolicy.mk8
1 files changed, 4 insertions, 4 deletions
diff --git a/package/checkpolicy/checkpolicy.mk b/package/checkpolicy/checkpolicy.mk
index c1fb43da4d..52f816098d 100644
--- a/package/checkpolicy/checkpolicy.mk
+++ b/package/checkpolicy/checkpolicy.mk
@@ -11,22 +11,22 @@ CHECKPOLICY_LICENSE_FILES = COPYING
CHECKPOLICY_DEPENDENCIES = libselinux flex host-flex host-bison
-TARGET_CHECKPOLICY_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) \
+CHECKPOLICY_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) \
LEX="$(HOST_DIR)/bin/flex" \
YACC="$(HOST_DIR)/bin/bison -y"
# DESTDIR is used at build time to find libselinux
define CHECKPOLICY_BUILD_CMDS
- $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CHECKPOLICY_MAKE_OPTS) DESTDIR=$(STAGING_DIR)
+ $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(CHECKPOLICY_MAKE_OPTS) DESTDIR=$(STAGING_DIR)
endef
define CHECKPOLICY_STAGING_CMDS
- $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CHECKPOLICY_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install
+ $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(CHECKPOLICY_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install
endef
define CHECKPOLICY_INSTALL_TARGET_CMDS
- $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CHECKPOLICY_MAKE_OPTS) DESTDIR=$(TARGET_DIR) install
+ $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(CHECKPOLICY_MAKE_OPTS) DESTDIR=$(TARGET_DIR) install
endef
HOST_CHECKPOLICY_DEPENDENCIES = host-libselinux host-flex host-bison