bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Install libusb-config to $(STAGING_DIR)/host/bin rather then

Browse Source 
$(STAGING_DIR)/usr/bin.
sispmctl doesn't need help finding libusb-config anymore.


git-svn-id: svn://svn.openwrt.org/openwrt/packages@12906 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
lars 2008-10-08 16:19:02 +00:00
parent 56625f9e9e
commit 2e53cd3a51
2 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
libs/libusb/Makefile
View File

@ -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. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -18,6 +18,8 @@ PKG_MD5SUM:=caf182cbc7565dac0fd72155919672e6
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
PKG_INSTALL=1
define Package/libusb define Package/libusb
SECTION:=libs SECTION:=libs
CATEGORY:=Libraries CATEGORY:=Libraries
@ -34,26 +36,36 @@ endef
TARGET_CFLAGS += $(FPIC) TARGET_CFLAGS += $(FPIC)
define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR) \
DESTDIR="$(PKG_INSTALL_DIR)" \
all install
endef
define Build/InstallDev define Build/InstallDev
mkdir -p $(1)/usr/bin $(INSTALL_DIR) $(2)/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libusb-config $(1)/usr/bin/ $(INSTALL_BIN) \
mkdir -p $(1)/usr/include $(PKG_INSTALL_DIR)/usr/bin/libusb-config \
$(CP) $(PKG_INSTALL_DIR)/usr/include/usb.h $(1)/usr/include/ $(2)/bin/
mkdir -p $(1)/usr/lib $(SED) \
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libusb*.{a,so*} $(1)/usr/lib/ 's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' \
mkdir -p $(1)/usr/lib/pkgconfig $(2)/bin/libusb-config
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libusb.pc $(1)/usr/lib/pkgconfig/
$(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 endef
define Package/libusb/install define Package/libusb/install
$(INSTALL_DIR) $(1)/usr/lib $(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 endef
$(eval $(call BuildPackage,libusb)) $(eval $(call BuildPackage,libusb))

3
utils/sispmctl/Makefile
View File

@ -41,9 +41,6 @@ CONFIGURE_ARGS += \
--enable-webless \ --enable-webless \
--disable-dependency-tracking \ --disable-dependency-tracking \
CONFIGURE_VARS += \
ac_cv_path_HAVELIBUSB="$(STAGING_DIR)/usr/bin/libusb-config" \
define Package/sispmctl/install define Package/sispmctl/install
$(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/$(PKG_NAME) $(1)/usr/bin/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/$(PKG_NAME) $(1)/usr/bin/