X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/bab4efad53ecef261da2a6b6fc4cd1e834636da6..8a4030dce62011bd84f61a6fce63292417912652:/openwrt/package/rules.mk

diff --git a/openwrt/package/rules.mk b/openwrt/package/rules.mk
index 504eb1518..9bbf4fa48 100644
--- a/openwrt/package/rules.mk
+++ b/openwrt/package/rules.mk
@@ -37,7 +37,7 @@ endef
 
 ifneq ($(strip $(PKG_SOURCE)),)
 $(DL_DIR)/$(PKG_SOURCE):
-	@$(PKG_TRACE) "downloading... "
+	@$(CMD_TRACE) "downloading... "
 	$(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(PKG_SOURCE)" "$(PKG_MD5SUM)" $(PKG_SOURCE_URL) $(MAKE_TRACE) 
 endif
 
@@ -45,7 +45,11 @@ ifneq ($(strip $(PKG_CAT)),)
 $(PKG_BUILD_DIR)/.prepared: $(DL_DIR)/$(PKG_SOURCE)
 	rm -rf $(PKG_BUILD_DIR)
 	mkdir -p $(PKG_BUILD_DIR)
-	$(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(PKG_BUILD_DIR)/.. $(TAR_OPTIONS) -
+	if [ "$(PKG_CAT)" = "unzip" ]; then \
+		unzip -d $(PKG_BUILD_DIR) $(DL_DIR)/$(PKG_SOURCE) ; \
+	else \
+		$(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(PKG_BUILD_DIR)/.. $(TAR_OPTIONS) - ; \
+	fi						  
 	if [ -d ./patches ]; then \
 		$(PATCH) $(PKG_BUILD_DIR) ./patches ; \
 	fi
@@ -55,7 +59,7 @@ endif
 all: compile
 
 source: $(DL_DIR)/$(PKG_SOURCE)
-prepare:
+prepare: source
 	@[ -f $(PKG_BUILD_DIR)/.prepared ] || { \
 		$(CMD_TRACE) "preparing... "; \
 		$(MAKE) $(PKG_BUILD_DIR)/.prepared $(MAKE_TRACE); \
@@ -86,8 +90,8 @@ rebuild:
 	fi
 	$(MAKE) compile $(MAKE_TRACE)
 
-$(PKG_BUILD_DIR)/.configured: prepare
-$(PKG_BUILD_DIR)/.built: configure
+$(PKG_BUILD_DIR)/.configured:
+$(PKG_BUILD_DIR)/.built:
 
 $(PACKAGE_DIR):
 	mkdir -p $@