From 584e60c7972c6f720492c31f82715af9328eda06 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Thu, 27 Mar 2008 13:00:31 +0000
Subject: libusb: correctly install into STAGING_DIR/usr

Closes #2494
---
 package/libusb/libusb.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'package/libusb')

diff --git a/package/libusb/libusb.mk b/package/libusb/libusb.mk
index 2c215a479..941bc485c 100644
--- a/package/libusb/libusb.mk
+++ b/package/libusb/libusb.mk
@@ -45,17 +45,17 @@ $(LIBUSB_DIR)/.configured: $(LIBUSB_DIR)/.unpacked
 		--target=$(GNU_TARGET_NAME) \
 		--host=$(GNU_TARGET_NAME) \
 		--build=$(GNU_HOST_NAME) \
-		--prefix=/ \
+		--prefix=$(STAGING_DIR)/usr \
 		--disable-debug \
 		--disable-build-docs \
 	)
 	touch $@
 
-$(STAGING_DIR)/lib/libusb.so: $(LIBUSB_DIR)/.configured
+$(STAGING_DIR)/usr/lib/libusb.so: $(LIBUSB_DIR)/.configured
 	$(MAKE) -C $(LIBUSB_DIR)
-	$(MAKE) -C $(LIBUSB_DIR) DESTDIR=$(STAGING_DIR) install
+	$(MAKE) -C $(LIBUSB_DIR) install
 
-$(TARGET_DIR)/$(LIBUSB_BINARY): $(STAGING_DIR)/lib/libusb.so
+$(TARGET_DIR)/$(LIBUSB_BINARY): $(STAGING_DIR)/usr/lib/libusb.so
 	cp -dpf $(STAGING_DIR)/usr/lib/libusb*.so* $(TARGET_DIR)/usr/lib/
 	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libusb*.so*
 
-- 
cgit v1.2.3