fix kmod-* build error when wildcards are being used in $(FILES)

[openwrt.git] / target / sdk / Makefile

diff --git a/target/sdk/Makefile b/target/sdk/Makefile
index 76e0afc..9f12631 100644 (file)
--- a/target/sdk/Makefile
+++ b/target/sdk/Makefile
@@ -18,17 +18,16 @@ SDK_BUILD_DIR:=$(BUILD_DIR)/$(SDK_NAME)
 
 all: compile
 
 
 all: compile
 

-$(BIN_DIR)/$(SDK_NAME).tar.bz2:
-       (cd $(STAGING_DIR); \
-               rm -rf info man share stampfiles; \
-               cd usr; \
-               rm -rf doc info man share; \
-       )
-       rm -rf $(SDK_BUILD_DIR)
+$(BIN_DIR)/$(SDK_NAME).tar.bz2: clean

        mkdir -p $(SDK_BUILD_DIR)/dl $(SDK_BUILD_DIR)/package
        $(CP) $(INCLUDE_DIR) $(SCRIPT_DIR) $(TOPDIR)/docs $(SDK_BUILD_DIR)/
        $(TAR) -cf - -C $(TOPDIR) --exclude=ccache/ staging_dir_$(ARCH) | \
                $(TAR) -xf - -C $(SDK_BUILD_DIR)
        mkdir -p $(SDK_BUILD_DIR)/dl $(SDK_BUILD_DIR)/package
        $(CP) $(INCLUDE_DIR) $(SCRIPT_DIR) $(TOPDIR)/docs $(SDK_BUILD_DIR)/
        $(TAR) -cf - -C $(TOPDIR) --exclude=ccache/ staging_dir_$(ARCH) | \
                $(TAR) -xf - -C $(SDK_BUILD_DIR)

+       (cd $(SDK_BUILD_DIR)/staging_dir_$(ARCH); \
+               rm -rf info man share stampfiles; \
+               cd usr; \
+               rm -rf doc info man share; \
+       )

        $(CP) $(TOPDIR)/rules.mk $(TOPDIR)/.config $(SDK_BUILD_DIR)/
        $(CP) $(TOPDIR)/package/Makefile $(SDK_BUILD_DIR)/package/
        $(CP) ./files/Makefile $(SDK_BUILD_DIR)/
        $(CP) $(TOPDIR)/rules.mk $(TOPDIR)/.config $(SDK_BUILD_DIR)/
        $(CP) $(TOPDIR)/package/Makefile $(SDK_BUILD_DIR)/package/
        $(CP) ./files/Makefile $(SDK_BUILD_DIR)/


@@ -36,8 +35,8 @@ $(BIN_DIR)/$(SDK_NAME).tar.bz2:
        $(CP) ./files/package/rules.mk $(SDK_BUILD_DIR)/package/
        echo OPENWRTVERSION:=$(OPENWRTVERSION) > $(SDK_BUILD_DIR)/.version.mk
        rm -rf $(SDK_BUILD_DIR)/staging_dir*/ccache
        $(CP) ./files/package/rules.mk $(SDK_BUILD_DIR)/package/
        echo OPENWRTVERSION:=$(OPENWRTVERSION) > $(SDK_BUILD_DIR)/.version.mk
        rm -rf $(SDK_BUILD_DIR)/staging_dir*/ccache

-       find $(SDK_BUILD_DIR) -name .svn | xargs rm -rf 
-       find $(SDK_BUILD_DIR) -name CVS | xargs rm -rf 
+       find $(SDK_BUILD_DIR) -name .svn | xargs -r rm -rf
+       find $(SDK_BUILD_DIR) -name CVS | xargs -r rm -rf

        (cd $(BUILD_DIR); \
                tar cfj $@ $(SDK_NAME); \
        )
        (cd $(BUILD_DIR); \
                tar cfj $@ $(SDK_NAME); \
        )


@@ -45,7 +44,7 @@ $(BIN_DIR)/$(SDK_NAME).tar.bz2:
 download:
 prepare:
 compile: $(BIN_DIR)/$(SDK_NAME).tar.bz2
 download:
 prepare:
 compile: $(BIN_DIR)/$(SDK_NAME).tar.bz2

-install:
+install: compile

 
 clean:
        rm -rf $(SDK_BUILD_DIR) $(BIN_DIR)/$(SDK_NAME).tar.bz2
 
 clean:
        rm -rf $(SDK_BUILD_DIR) $(BIN_DIR)/$(SDK_NAME).tar.bz2