summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2008-03-27 13:00:31 +0000
committerPeter Korsgaard <jacmet@sunsite.dk>2008-03-27 13:00:31 +0000
commit584e60c7972c6f720492c31f82715af9328eda06 (patch)
treefb1cbdcb8f6c61a976b01751dab90596d6d173ca
parentca89923ee022c4c3ebf0f50df40e93f840021cbb (diff)
libusb: correctly install into STAGING_DIR/usr
Closes #2494
-rw-r--r--package/libusb/libusb.mk8
1 files changed, 4 insertions, 4 deletions
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*