From 283793a6ca28bbdb2d57a052c06ad3076390e760 Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Wed, 5 Jul 2017 13:14:51 +0200 Subject: [PATCH] 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) Signed-off-by: Thomas Petazzoni --- package/checkpolicy/checkpolicy.mk | 10 ++++++---- 1 file 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)) -- 2.30.2