X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=include%2Funpack.mk;h=e533476b5276c1b8dd91ba5aae08e1426426ab43;hb=cae6d4f9edd86b03a3e6a763fe9afbb2a1aaefb7;hp=e56f62415206d313b075b170b2fc5f8b92082052;hpb=571d37fe94f40eb630cee1d81151122038513a48;p=openwrt-10.03%2F.git

diff --git a/include/unpack.mk b/include/unpack.mk
index e56f62415..e533476b5 100644
--- a/include/unpack.mk
+++ b/include/unpack.mk
@@ -1,13 +1,18 @@
 ifeq ($(strip $(PKG_UNPACK)),)
+  ifneq ($(HOST_OS),Linux)
+	HOST_TAR:=trapret 2 $(TAR)
+  else
+    HOST_TAR:=$(TAR)
+  endif
   ifneq ($(strip $(PKG_CAT)),)
     # use existing PKG_CAT
-    PKG_UNPACK:=$(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | $(TAR) -C $(PKG_BUILD_DIR)/.. $(TAR_OPTIONS)
+    PKG_UNPACK:=$(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | $(HOST_TAR) -C $(PKG_BUILD_DIR)/.. $(TAR_OPTIONS)
     ifeq ($(PKG_CAT),unzip)
-      PKG_UNPACK=unzip -d $(PKG_BUILD_DIR) $(DL_DIR)/$(PKG_SOURCE)
+      PKG_UNPACK:=unzip -d $(PKG_BUILD_DIR)/.. $(DL_DIR)/$(PKG_SOURCE)
     endif
     # replace zcat with $(ZCAT), because some system have it as gzcat
     ifeq ($(PKG_CAT),zcat)
-      PKG_UNPACK:=$(ZCAT) $(DL_DIR)/$(PKG_SOURCE) | $(TAR) -C $(PKG_BUILD_DIR)/.. $(TAR_OPTIONS)
+      PKG_UNPACK:=$(ZCAT) $(DL_DIR)/$(PKG_SOURCE) | $(HOST_TAR) -C $(PKG_BUILD_DIR)/.. $(TAR_OPTIONS)
     endif
   else
     # try to autodetect file type