Fix exec permission on /etc/init.d/S60nfsd

[openwrt.git] / openwrt / package / libusb / Makefile

diff --git a/openwrt/package/libusb/Makefile b/openwrt/package/libusb/Makefile
index ae7782d..486de90 100644 (file)
--- a/openwrt/package/libusb/Makefile
+++ b/openwrt/package/libusb/Makefile
@@ -48,16 +48,16 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
                --enable-shared \
                --enable-static \
        );
-       touch $(PKG_BUILD_DIR)/.configured
+       touch $@
 
 $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
-       $(MAKE) -C $(PKG_BUILD_DIR) -j1 \
-               CC=$(TARGET_CC) LD=$(TARGET_CROSS)ld ARCH=$(ARCH)
+       rm -rf $(PKG_INSTALL_DIR)
        mkdir -p $(PKG_INSTALL_DIR)
-       $(MAKE) -C $(PKG_BUILD_DIR) \
+       $(MAKE) -C $(PKG_BUILD_DIR) -j1 \
+               CC=$(TARGET_CC) LD=$(TARGET_CROSS)ld ARCH=$(ARCH) \
                DESTDIR="$(PKG_INSTALL_DIR)" \
-               install
-       touch $(PKG_BUILD_DIR)/.built
+               all install
+       touch $@
 
 $(IPKG_LIBUSB):
        install -m0755 -d $(IDIR_LIBUSB)/usr/lib
@@ -65,20 +65,22 @@ $(IPKG_LIBUSB):
        $(RSTRIP) $(IDIR_LIBUSB)
        $(IPKG_BUILD) $(IDIR_LIBUSB) $(PACKAGE_DIR)
 
-$(STAGING_DIR)/usr/lib/libusb.so: $(PKG_BUILD_DIR)/.libs/libusb.so
+$(STAGING_DIR)/usr/lib/libusb.so: $(PKG_BUILD_DIR)/.built
        mkdir -p $(STAGING_DIR)/usr/bin
        cp -fpR $(PKG_INSTALL_DIR)/usr/bin/libusb-config $(STAGING_DIR)/usr/bin/
        mkdir -p $(STAGING_DIR)/usr/include
        cp -fpR $(PKG_INSTALL_DIR)/usr/include/usb.h $(STAGING_DIR)/usr/include/
        mkdir -p $(STAGING_DIR)/usr/lib
        cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libusb*.{a,so*} $(STAGING_DIR)/usr/lib/
-       touch $(STAGING_DIR)/usr/lib/libusb.so
+       touch $@
 
 install-dev: $(STAGING_DIR)/usr/lib/libusb.so
 
 uninstall-dev:
-       rm -rf $(STAGING_DIR)/usr/include/usb.h
-       rm -rf $(STAGING_DIR)/usr/lib/libusb.{a,so*}
+       rm -rf \
+               $(STAGING_DIR)/usr/bin/libusb-config \
+               $(STAGING_DIR)/usr/include/usb.h \
+               $(STAGING_DIR)/usr/lib/libusb*.{a,so*} \
 
 compile: install-dev
 clean: uninstall-dev