botan: fix install directory

---
 package/botan/botan.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

index 7f0bbb6..e07b786 100644
@@ -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))

2.7.4

Hello,

Thanks for your contribution!

It would be nice to have a bit more details in the commit log here, so that we understand exactly what it is fixing, and whether this fix should be pushed to the master branch or the next branch.

Is it that with the current DESTDIR value, botan gets installed in STAGING_DIR/usr/usr ?

Thanks,

Thomas

Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

Hi thomas,

Yes that is.

While i was working on a kea-dhcp package that depends on botan. I see something weird with the botan install directory.

Before my patch :
output/target/usr/usr/lib/libbotan-2.so output/target/usr/usr/lib/pkgconfig/botan-2.pc output/target/usr/usr/lib/python2.7/site-packages/botan2.py output/target/usr/usr/lib/libbotan-2.so.8.8.0 output/target/usr/usr/lib/libbotan-2.so.8 output/target/usr/usr/bin/botan

After my patch :
./output/target/usr/lib/libbotan-2.so ./output/target/usr/lib/python2.7/site-packages/botan2.py ./output/target/usr/lib/libbotan-2.so.8.8.0 ./output/target/usr/lib/libbotan-2.so.8 ./output/target/usr/bin/botan

Best regards,
DUPONCHEEL S?bastien

Le 23/11/2018 ? 15:50, Thomas Petazzoni a ?crit?:

Hello,

Applied to master with an extended commit log. Thanks!

Thomas

Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com