From 6342c83201d5fd2acef0f3193f53b19f74b14c73 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Sun, 1 Oct 2006 15:17:52 +0000 Subject: - 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) --- package/gzip/Config.in | 2 +- package/gzip/gzip.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'package/gzip') diff --git a/package/gzip/Config.in b/package/gzip/Config.in index e80789454..45e4f65d1 100644 --- a/package/gzip/Config.in +++ b/package/gzip/Config.in @@ -3,6 +3,6 @@ config BR2_PACKAGE_GZIP default n help Standard GNU compressor. Provides things like gzip, - gunzip, gzcat, etc... + gunzip, g$(ZCAT), etc... http://www.gnu.org/software/gzip/gzip.html diff --git a/package/gzip/gzip.mk b/package/gzip/gzip.mk index 542190cc4..1c420e401 100644 --- a/package/gzip/gzip.mk +++ b/package/gzip/gzip.mk @@ -8,7 +8,7 @@ GZIP_SOURCE:=gzip-$(GZIP_VER).tar.gz #GZIP_SITE:=ftp://alpha.gnu.org/gnu/gzip GZIP_SITE:=http://mirrors.ircam.fr/pub/gnu/alpha/gnu/gzip GZIP_DIR:=$(BUILD_DIR)/gzip-$(GZIP_VER) -GZIP_CAT:=zcat +GZIP_CAT:=$(ZCAT) GZIP_BINARY:=$(GZIP_DIR)/gzip GZIP_TARGET_BINARY:=$(TARGET_DIR)/bin/zmore @@ -57,7 +57,7 @@ $(GZIP_TARGET_BINARY): $(GZIP_BINARY) $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc (cd $(TARGET_DIR)/bin; \ ln -snf gzip gunzip; \ - ln -snf gzip zcat; \ + ln -snf gzip $(ZCAT); \ ln -snf zdiff zcmp; \ ln -snf zgrep zegrep; \ ln -snf zgrep zfgrep;) -- cgit v1.2.3