Forráskód Böngészése

fix mistakes in unpack change

SVN-Revision: 5077
Felix Fietkau 19 éve
szülő
commit
794114c706
3 módosított fájl, 6 hozzáadás és 6 törlés
  1. 2 2
      include/host-build.mk
  2. 1 1
      include/package.mk
  3. 3 3
      include/unpack.mk

+ 2 - 2
include/host-build.mk

@@ -8,9 +8,9 @@
 include $(INCLUDE_DIR)/host.mk
 include $(INCLUDE_DIR)/unpack.mk
 
-ifneq ($(strip $(UNPACK)),)
+ifneq ($(strip $(PKG_UNPACK)),)
   define Build/Prepare/Default
-  	$(UNPACK)
+  	$(PKG_UNPACK)
 	@if [ -d ./patches ]; then \
 		$(PATCH) $(PKG_BUILD_DIR) ./patches; \
 	fi

+ 1 - 1
include/package.mk

@@ -272,7 +272,7 @@ endef
 
 ifneq ($(strip $(PKG_UNPACK)),)
   define Build/Prepare/Default
-  	$(UNPACK)
+  	$(PKG_UNPACK)
 	@if [ -d ./patches ]; then \
 		$(PATCH) $(PKG_BUILD_DIR) ./patches; \
 	fi

+ 3 - 3
include/unpack.mk

@@ -1,13 +1,13 @@
 ifeq ($(strip $(PKG_UNPACK)),)
   ifneq ($(strip $(PKG_CAT)),)
     # use existing PKG_CAT
-    UNPACK:=$(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(PKG_BUILD_DIR)/.. $(TAR_OPTIONS) -
+    PKG_UNPACK:=$(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(PKG_BUILD_DIR)/.. $(TAR_OPTIONS) -
     ifeq ($(PKG_CAT),unzip)
-      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)
-      UNPACK:=$(ZCAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(PKG_BUILD_DIR)/.. $(TAR_OPTIONS) -
+      PKG_UNPACK:=$(ZCAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(PKG_BUILD_DIR)/.. $(TAR_OPTIONS) -
     endif
   else
     # try to autodetect file type