fix configure and opt flags, cleanup, actually revert [8668] after [8672]

[openwrt/svn-archive/archive.git] / libs / libusb / Makefile

diff --git a/libs/libusb/Makefile b/libs/libusb/Makefile
index ff47c7c813f50f739d8c16cf7e1209eb469cb1ee..7dc7932cb4aa12692de36fc6f8db9f152a71f194 100644 (file)
--- a/libs/libusb/Makefile
+++ b/libs/libusb/Makefile
@@ -9,12 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libusb
-PKG_VERSION:=0.1.10a
+PKG_VERSION:=0.1.12
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/libusb
-PKG_MD5SUM:=c6062b29acd2cef414bcc34e0decbdd1
+PKG_MD5SUM:=caf182cbc7565dac0fd72155919672e6
 PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
@@ -49,13 +49,18 @@ define Build/InstallDev
        $(CP) $(PKG_INSTALL_DIR)/usr/include/usb.h $(STAGING_DIR)/usr/include/
        mkdir -p $(STAGING_DIR)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libusb*.{a,so*} $(STAGING_DIR)/usr/lib/
+       mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libusb.pc $(STAGING_DIR)/usr/lib/pkgconfig/
+       $(SED) 's,-I$$$${includedir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/libusb.pc
+       $(SED) 's,-L$$$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/libusb.pc
 endef
 
 define Build/UninstallDev
        rm -rf \
                $(STAGING_DIR)/usr/bin/libusb-config \
                $(STAGING_DIR)/usr/include/usb.h \
-               $(STAGING_DIR)/usr/lib/libusb*.{a,so*}
+               $(STAGING_DIR)/usr/lib/libusb*.{a,so*} \
+               $(STAGING_DIR)/usr/lib/pkgconfig/libusb.pc
 endef
 
 define Package/libusb/install