aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar DUPONCHEEL S├ębastien <sebastien.duponcheel@corp.ovh.com>2018-11-23 15:27:39 +0100
committerGravatar Thomas Petazzoni <thomas.petazzoni@bootlin.com>2018-11-23 21:47:50 +0100
commit1dcea42403cd1c574c4cbabece6fd9eb2fd933e5 (patch)
treef4c4675964393b9a4cb0eda32488e62d74d97ba8
parent7031cab9d59efac552972f6bff6c1488987cc07f (diff)
downloadbuildroot-1dcea42403cd1c574c4cbabece6fd9eb2fd933e5.tar.gz
buildroot-1dcea42403cd1c574c4cbabece6fd9eb2fd933e5.tar.bz2
botan: fix install directory
Using $(STAGING_DIR)/usr and $(TARGET_DIR)/usr as the DESTDIR value causes Botan to be installed in $(STAGING_DIR)/usr/usr and $(TARGET_DIR)/usr/usr, which obviously isn't correct. Let's fix that by passing the appropriate DESTDIR values. Signed-off-by: DUPONCHEEL S├ębastien <sebastien.duponcheel@corp.ovh.com> [Thomas: extend commit log.] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-rw-r--r--package/botan/botan.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/package/botan/botan.mk b/package/botan/botan.mk
index 7f0bbb66c9..e07b786c85 100644
--- a/package/botan/botan.mk
+++ b/package/botan/botan.mk
@@ -92,11 +92,11 @@ define BOTAN_BUILD_CMDS
endef
define BOTAN_INSTALL_STAGING_CMDS
- $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(STAGING_DIR)/usr" install
+ $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(STAGING_DIR)" install
endef
define BOTAN_INSTALL_TARGET_CMDS
- $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(TARGET_DIR)/usr" install
+ $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(TARGET_DIR)" install
endef
$(eval $(generic-package))