- use $(ZCAT) as configured by the user instead of hardcoded 'zcat' that may not exist; Closes #971

  Silly, unchecked sed -i -e "/[^b]zcat/s/zcat/\$\(ZCAT\)/g" $(svngrep "[^b]zcat" * -rl | grep -v Config.in)

7 files changed, 8 insertions, 8 deletions

diff --git a/target/cloop/cloop.mk b/target/cloop/cloop.mk
index fb55a2914..8484ffedd 100644
--- a/target/cloop/cloop.mk
+++ b/target/cloop/cloop.mk
@@ -23,9 +23,9 @@ $(DL_DIR)/$(CLOOP_SOURCE):
 	 $(WGET) -P $(DL_DIR) $(CLOOP_SITE)/$(CLOOP_SOURCE)
 
 $(CLOOP_DIR)/.unpacked: $(DL_DIR)/$(CLOOP_SOURCE) ### $(DL_DIR)/$(CLOOP_PATCH1)
-	zcat $(DL_DIR)/$(CLOOP_SOURCE) | tar -C $(BUILD_DIR) -xvf -
+	$(ZCAT) $(DL_DIR)/$(CLOOP_SOURCE) | tar -C $(BUILD_DIR) -xvf -
 	touch $(CLOOP_DIR)/.unpacked
-###		zcat $(DL_DIR)/$(CLOOP_PATCH1) | patch -p1 -d $(CLOOP_DIR)
+###		$(ZCAT) $(DL_DIR)/$(CLOOP_PATCH1) | patch -p1 -d $(CLOOP_DIR)
 ###		toolchain/patch-kernel.sh $(CLOOP_DIR) target/cloop/ cloop*.patch
 
 $(CLOOP_DIR)/create_compressed_fs: $(CLOOP_DIR)/.unpacked
diff --git a/target/cramfs/cramfs.mk b/target/cramfs/cramfs.mk
index 0243de467..2d7f4b158 100644
--- a/target/cramfs/cramfs.mk
+++ b/target/cramfs/cramfs.mk
@@ -17,7 +17,7 @@ $(DL_DIR)/$(CRAMFS_SOURCE):
 	 $(WGET) -P $(DL_DIR) $(CRAMFS_SITE)/$(CRAMFS_SOURCE)
 
 $(CRAMFS_DIR): $(DL_DIR)/$(CRAMFS_SOURCE)
-	zcat $(DL_DIR)/$(CRAMFS_SOURCE) | tar -C $(BUILD_DIR) -xvf -
+	$(ZCAT) $(DL_DIR)/$(CRAMFS_SOURCE) | tar -C $(BUILD_DIR) -xvf -
 	toolchain/patch-kernel.sh $(CRAMFS_DIR) target/cramfs/ cramfs\*.patch
 
 $(CRAMFS_DIR)/mkcramfs: $(CRAMFS_DIR)
diff --git a/target/device/Soekris/soekris_gpio/soekris_gpio.mk b/target/device/Soekris/soekris_gpio/soekris_gpio.mk
index 4bbfae411..6b692ee5c 100644
--- a/target/device/Soekris/soekris_gpio/soekris_gpio.mk
+++ b/target/device/Soekris/soekris_gpio/soekris_gpio.mk
@@ -26,7 +26,7 @@ SOEKRIS_GPIO_VER:=1.3.2
 SOEKRIS_GPIO_DIR:=$(BUILD_DIR)/gpio-$(SOEKRIS_GPIO_VER)
 SOEKRIS_GPIO_SITE:=http://soekris.hejl.de
 SOEKRIS_GPIO_SOURCE:=gpio-$(SOEKRIS_GPIO_VER).tar.gz
-SOEKRIS_GPIO_CAT:=zcat
+SOEKRIS_GPIO_CAT:=$(ZCAT)
 SOEKRIS_GPIO_MODULE_DIR=lib/modules/$(LINUX_VERSION)/kernel/drivers/soekris/
 
 $(DL_DIR)/$(SOEKRIS_GPIO_SOURCE):
diff --git a/target/ext2/ext2root.mk b/target/ext2/ext2root.mk
index 83fdd24f4..c7c7cb200 100644
--- a/target/ext2/ext2root.mk
+++ b/target/ext2/ext2root.mk
@@ -11,7 +11,7 @@ $(DL_DIR)/$(GENEXT2_SOURCE):
 	$(WGET) -P $(DL_DIR) $(GENEXT2_SITE)/$(GENEXT2_SOURCE)
 
 $(GENEXT2_DIR)/.unpacked: $(DL_DIR)/$(GENEXT2_SOURCE)
-	zcat $(DL_DIR)/$(GENEXT2_SOURCE) | tar -C $(BUILD_DIR) -xvf -
+	$(ZCAT) $(DL_DIR)/$(GENEXT2_SOURCE) | tar -C $(BUILD_DIR) -xvf -
 	mv $(GENEXT2_DIR).orig $(GENEXT2_DIR)
 	toolchain/patch-kernel.sh $(GENEXT2_DIR) target/ext2/ genext2fs\*.patch
 	touch $(GENEXT2_DIR)/.unpacked
diff --git a/target/powerpc/yaboot/yaboot.mk b/target/powerpc/yaboot/yaboot.mk
index d463bcb7d..87bc6df56 100644
--- a/target/powerpc/yaboot/yaboot.mk
+++ b/target/powerpc/yaboot/yaboot.mk
@@ -16,7 +16,7 @@ $(DL_DIR)/$(YABOOT_SOURCE):
 yaboot-source: $(DL_DIR)/$(YABOOT_SOURCE)
 
 $(YABOOT_DIR)/Makefile: $(DL_DIR)/$(YABOOT_SOURCE)
-	zcat $(DL_DIR)/$(YABOOT_SOURCE) | tar -C $(BUILD_DIR) -xvf -
+	$(ZCAT) $(DL_DIR)/$(YABOOT_SOURCE) | tar -C $(BUILD_DIR) -xvf -
 	touch -c $(YABOOT_DIR)/Makefile
 
 $(YABOOT_DIR)/second/yaboot: $(YABOOT_DIR)/Makefile
diff --git a/target/squashfs/squashfsroot.mk b/target/squashfs/squashfsroot.mk
index 18e89772d..e4c9edc3d 100644
--- a/target/squashfs/squashfsroot.mk
+++ b/target/squashfs/squashfsroot.mk
@@ -7,7 +7,7 @@ SQUASHFS_VERSION:=3.1
 SQUASHFS_DIR:=$(BUILD_DIR)/squashfs$(SQUASHFS_VERSION)
 SQUASHFS_SOURCE:=squashfs$(SQUASHFS_VERSION).tar.gz
 SQUASHFS_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/squashfs
-SQUASHFS_CAT:=zcat
+SQUASHFS_CAT:=$(ZCAT)
 
 $(DL_DIR)/$(SQUASHFS_SOURCE):
 	 $(WGET) -P $(DL_DIR) $(SQUASHFS_SITE)/$(SQUASHFS_SOURCE)
diff --git a/target/x86/grub/grub.mk b/target/x86/grub/grub.mk
index 092aa7e77..62fc99c97 100644
--- a/target/x86/grub/grub.mk
+++ b/target/x86/grub/grub.mk
@@ -7,7 +7,7 @@ ifeq ($(ARCH),i386)
 GRUB_SOURCE:=grub_0.97.orig.tar.gz
 GRUB_PATCH=grub_0.97-5.diff.gz
 GRUB_SITE=http://ftp.debian.org/debian/pool/main/g/grub
-GRUB_CAT:=zcat
+GRUB_CAT:=$(ZCAT)
 GRUB_DIR:=$(BUILD_DIR)/grub-0.97
 GRUB_BINARY:=grub/grub
 GRUB_TARGET_BINARY:=bin/grub