From ac7adf7a068ab878ecad51bbb22193cbe2e85da7 Mon Sep 17 00:00:00 2001
From: Lars-Peter Clausen <lars@metafoo.de>
Date: Wed, 8 Oct 2008 16:19:02 +0000
Subject: [PATCH] Install libusb-config to $(STAGING_DIR)/host/bin rather then
 $(STAGING_DIR)/usr/bin. sispmctl doesn't need help finding libusb-config
 anymore.

SVN-Revision: 12906
---
 libs/libusb/Makefile    | 46 ++++++++++++++++++++++++++---------------
 utils/sispmctl/Makefile |  3 ---
 2 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/libs/libusb/Makefile b/libs/libusb/Makefile
index ed6ad4cec8..8185060f0e 100644
--- a/libs/libusb/Makefile
+++ b/libs/libusb/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2006-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -18,6 +18,8 @@ PKG_MD5SUM:=caf182cbc7565dac0fd72155919672e6
 
 include $(INCLUDE_DIR)/package.mk
 
+PKG_INSTALL=1
+
 define Package/libusb
   SECTION:=libs
   CATEGORY:=Libraries
@@ -34,26 +36,36 @@ endef
 
 TARGET_CFLAGS += $(FPIC)
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
-
 define Build/InstallDev
-	mkdir -p $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libusb-config $(1)/usr/bin/
-	mkdir -p $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/usb.h $(1)/usr/include/
-	mkdir -p $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libusb*.{a,so*} $(1)/usr/lib/
-	mkdir -p $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libusb.pc $(1)/usr/lib/pkgconfig/
+	$(INSTALL_DIR) $(2)/bin
+	$(INSTALL_BIN) \
+		$(PKG_INSTALL_DIR)/usr/bin/libusb-config \
+		$(2)/bin/
+	$(SED) \
+		's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' \
+		$(2)/bin/libusb-config
+
+	$(INSTALL_DIR) $(1)/usr/include
+	$(INSTALL_DATA) \
+		$(PKG_INSTALL_DIR)/usr/include/usb.h \
+		$(1)/usr/include/
+
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(INSTALL_DATA) \
+		$(PKG_INSTALL_DIR)/usr/lib/libusb*.{la,so*} \
+		$(1)/usr/lib/
+
+	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+	$(INSTALL_DATA) \
+		$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libusb.pc \
+		$(1)/usr/lib/pkgconfig/
 endef
 
 define Package/libusb/install
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libusb*.so.* $(1)/usr/lib/
+	$(INSTALL_DATA) \
+		$(PKG_INSTALL_DIR)/usr/lib/libusb*.so.* \
+		$(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,libusb))
diff --git a/utils/sispmctl/Makefile b/utils/sispmctl/Makefile
index 05d62a3e99..0e84dadab6 100644
--- a/utils/sispmctl/Makefile
+++ b/utils/sispmctl/Makefile
@@ -41,9 +41,6 @@ CONFIGURE_ARGS += \
 	--enable-webless \
 	--disable-dependency-tracking \
 
-CONFIGURE_VARS += \
-	ac_cv_path_HAVELIBUSB="$(STAGING_DIR)/usr/bin/libusb-config" \
-
 define Package/sispmctl/install
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/$(PKG_NAME) $(1)/usr/bin/
-- 
2.30.2