summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnout Vandecappelle <arnout@mind.be>2017-07-05 13:14:51 +0200
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-07-05 16:06:52 +0200
commit283793a6ca28bbdb2d57a052c06ad3076390e760 (patch)
tree669021e5233b01b7ac4ac5a946a2b4dbcf1d3578
parent8b8257e7d366a3c0306e1b3c0119193777555b0c (diff)
downloadbuildroot-283793a6ca28bbdb2d57a052c06ad3076390e760.tar.gz
buildroot-283793a6ca28bbdb2d57a052c06ad3076390e760.zip
checkpolicy: rework host installation
checkpolicy has a pretty peculiar interpretation of DESTDIR and PREFIX. PREFIX simply defaults to $(DESTDIR)/usr, and is used in the rest of the build system. DESTDIR isn't used any further. For the host installation, we don't want the usr part, so set PREFIX instead of DESTDIR. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/checkpolicy/checkpolicy.mk10
1 files changed, 6 insertions, 4 deletions
diff --git a/package/checkpolicy/checkpolicy.mk b/package/checkpolicy/checkpolicy.mk
index d80bb792b4..f0cca593d3 100644
--- a/package/checkpolicy/checkpolicy.mk
+++ b/package/checkpolicy/checkpolicy.mk
@@ -31,17 +31,19 @@ endef
HOST_CHECKPOLICY_DEPENDENCIES = host-libselinux host-flex host-bison
-HOST_CHECKPOLICY_MAKE_OPTS = $(HOST_CONFIGURE_OPTS) \
+# PREFIX is used at build time to find host-libselinux
+HOST_CHECKPOLICY_MAKE_OPTS = \
+ $(HOST_CONFIGURE_OPTS) \
+ PREFIX=$(HOST_DIR) \
LEX="$(HOST_DIR)/bin/flex" \
YACC="$(HOST_DIR)/bin/bison -y"
-# DESTDIR is used at build time to find host-libselinux
define HOST_CHECKPOLICY_BUILD_CMDS
- $(HOST_MAKE_ENV) $(MAKE) -C $(@D) $(HOST_CHECKPOLICY_MAKE_OPTS) DESTDIR=$(HOST_DIR)
+ $(HOST_MAKE_ENV) $(MAKE) -C $(@D) $(HOST_CHECKPOLICY_MAKE_OPTS)
endef
define HOST_CHECKPOLICY_INSTALL_CMDS
- $(HOST_MAKE_ENV) $(MAKE) -C $(@D) $(HOST_CHECKPOLICY_MAKE_OPTS) DESTDIR=$(HOST_DIR) install
+ $(HOST_MAKE_ENV) $(MAKE) -C $(@D) $(HOST_CHECKPOLICY_MAKE_OPTS) install
endef
$(eval $(generic-package))
OpenPOWER on IntegriCloud