X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/fb9fc446526b4873389d816090734da066829dbb..2b2bc6c3ccaff20a2b7767cd9ead475c0be040f8:/target/sdk/Makefile

diff --git a/target/sdk/Makefile b/target/sdk/Makefile
index 76e0afc78..24f603167 100644
--- a/target/sdk/Makefile
+++ b/target/sdk/Makefile
@@ -15,29 +15,29 @@ PKG_CPU:=$(shell uname -m)
 
 SDK_NAME:=OpenWrt-SDK-$(BOARD)-$(KERNEL)-for-$(PKG_OS)-$(PKG_CPU)
 SDK_BUILD_DIR:=$(BUILD_DIR)/$(SDK_NAME)
+EXCLUDE_DIRS:=ccache stamp
 
 all: compile
 
-$(BIN_DIR)/$(SDK_NAME).tar.bz2:
-	(cd $(STAGING_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="$(EXCLUDE_DIRS)" 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; \
 	)
-	rm -rf $(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)
 	$(CP) $(TOPDIR)/rules.mk $(TOPDIR)/.config $(SDK_BUILD_DIR)/
 	$(CP) $(TOPDIR)/package/Makefile $(SDK_BUILD_DIR)/package/
 	$(CP) ./files/Makefile $(SDK_BUILD_DIR)/
 	$(CP) ./files/README.SDK $(SDK_BUILD_DIR)/
 	$(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 
+	echo OPENWRTVERSION:="$(OPENWRTVERSION)" > $(SDK_BUILD_DIR)/.version.mk
+	rm -rf $(SDK_BUILD_DIR)/staging_dir/$(ARCH)/{ccache,stamp}
+	find $(SDK_BUILD_DIR) -name .svn | $(XARGS) rm -rf
+	find $(SDK_BUILD_DIR) -name CVS | $(XARGS) rm -rf
 	(cd $(BUILD_DIR); \
 		tar cfj $@ $(SDK_NAME); \
 	)
@@ -45,7 +45,7 @@ $(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