Commit 241f5078 authored by Yann E. MORIN's avatar Yann E. MORIN Committed by Peter Korsgaard
Browse files

package/checkpolicy: rename variable



We use package names as poor-man's namespace, so fix that.

Reported by utils/check-package.
Signed-off-by: default avatar"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: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>

(cherry picked from commit d9f771b9020bda091804fdc3ff75a2d5b18a0e6c)
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent 7567b9cc
......@@ -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
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment