Commit 6342c832 authored by Bernhard Reutner-Fischer's avatar Bernhard Reutner-Fischer
Browse files

- 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)
parent 859b9137

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ $(STAGING_DIR): 


$(TARGET_DIR):

	if [ -f "$(TARGET_SKELETON)" ] ; then \

		zcat $(TARGET_SKELETON) | tar -C $(BUILD_DIR) -xf -; \

		$(ZCAT) $(TARGET_SKELETON) | tar -C $(BUILD_DIR) -xf -; \

	fi;

	if [ -d "$(TARGET_SKEL_DIR)" ] ; then \

		cp -fa $(TARGET_SKEL_DIR)/* $(TARGET_DIR)/; \

docs/buildroot.html

+1 −1
Original line number Diff line number Diff line
@@ -465,7 +465,7 @@ config BR2_PACKAGE_FOO 
    14          $(WGET) -P $(DL_DIR) $(FOO_SITE)/$(FOO_SOURCE)

    15

    16  $(FOO_DIR)/.source: $(DL_DIR)/$(FOO_SOURCE)

    17          zcat $(DL_DIR)/$(FOO_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -

    17          $(ZCAT) $(DL_DIR)/$(FOO_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -

    18          touch $(FOO_DIR)/.source

    19

    20  $(FOO_DIR)/.configured: $(FOO_DIR)/.source

package/acpid/acpid.mk

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ $(DL_DIR)/$(ACPID_SOURCE): 
	$(WGET) -P $(DL_DIR) $(ACPID_SITE)/$(ACPID_SOURCE)



$(ACPID_DIR)/Makefile: $(DL_DIR)/$(ACPID_SOURCE)

	zcat $(DL_DIR)/$(ACPID_SOURCE) | tar -C $(BUILD_DIR) -xvf -

	$(ZCAT) $(DL_DIR)/$(ACPID_SOURCE) | tar -C $(BUILD_DIR) -xvf -

	$(SED) "s:ACPI_SOCKETFILE.*:ACPI_SOCKETFILE \"/tmp/acpid.socket\":" $(ACPID_DIR)/acpid.h

	touch -c $(ACPID_DIR)/Makefile

package/asterisk/asterisk.mk

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ $(DL_DIR)/$(ASTERISK_SOURCE): 
	$(WGET) -P $(DL_DIR) $(ASTERISK_SITE)/$(ASTERISK_SOURCE)



$(ASTERISK_DIR)/.source: $(DL_DIR)/$(ASTERISK_SOURCE)

	zcat $(DL_DIR)/$(ASTERISK_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -

	$(ZCAT) $(DL_DIR)/$(ASTERISK_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -

	toolchain/patch-kernel.sh $(ASTERISK_DIR) package/asterisk/ asterisk\*.patch

	touch $(ASTERISK_DIR)/.source

package/at/at.mk

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ AT_VER:=3.1.10 
AT_SOURCE:=at_$(AT_VER).tar.gz

AT_SITE:=http://ftp.debian.org/debian/pool/main/a/at

AT_DIR:=$(BUILD_DIR)/at-$(AT_VER)

AT_CAT:=zcat

AT_CAT:=$(ZCAT)

AT_TARGET_BINARY:=usr/bin/at



$(DL_DIR)/$(AT_SOURCE):