From 1dcea42403cd1c574c4cbabece6fd9eb2fd933e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?DUPONCHEEL=20S=C3=A9bastien?= Date: Fri, 23 Nov 2018 15:27:39 +0100 Subject: [PATCH] botan: fix install directory MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 [Thomas: extend commit log.] Signed-off-by: Thomas Petazzoni --- package/botan/botan.mk | 4 ++-- 1 file 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))