Commit 239a13b8 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf Committed by Rémi Denis-Courmont

Contrib: detect zcat vs gzcat

parent 59b38619
...@@ -112,7 +112,7 @@ FFMPEG_VERSION := git ...@@ -112,7 +112,7 @@ FFMPEG_VERSION := git
ffmpeg: ffmpeg-$(FFMPEG_VERSION).tar.gz .sum-ffmpeg ffmpeg: ffmpeg-$(FFMPEG_VERSION).tar.gz .sum-ffmpeg
rm -Rf $@ $@-git rm -Rf $@ $@-git
mkdir -p $@-git mkdir -p $@-git
zcat "$<" | (cd $@-git && tar xv --strip-components=1) $(ZCAT) "$<" | (cd $@-git && tar xv --strip-components=1)
ifdef HAVE_WIN32 ifdef HAVE_WIN32
sed -i "s/std=c99/std=gnu99/" $@-$(FFMPEG_VERSION)/configure sed -i "s/std=c99/std=gnu99/" $@-$(FFMPEG_VERSION)/configure
endif endif
......
...@@ -136,6 +136,14 @@ else ...@@ -136,6 +136,14 @@ else
download = $(error Neither curl nor wget found!) download = $(error Neither curl nor wget found!)
endif endif
ifeq ($(shell gzcat --version >/dev/null 2>&1 || echo FAIL),)
ZCAT = gzcat
else ifeq ($(shell zcat --version >/dev/null 2>&1 || echo FAIL),)
ZCAT = zcat
else
ZCAT ?= $(error Gunzip client (zcat) not found!)
endif
ifeq ($(shell sha512sum --version >/dev/null 2>&1 || echo FAIL),) ifeq ($(shell sha512sum --version >/dev/null 2>&1 || echo FAIL),)
SHA512SUM = sha512sum SHA512SUM = sha512sum
else ifeq ($(shell shasum --version >/dev/null 2>&1 || echo FAIL),) else ifeq ($(shell shasum --version >/dev/null 2>&1 || echo FAIL),)
......
...@@ -43,7 +43,7 @@ X264_VERSION := git ...@@ -43,7 +43,7 @@ X264_VERSION := git
x264: x264-$(X264_VERSION).tar.gz .sum-x264 x264: x264-$(X264_VERSION).tar.gz .sum-x264
rm -Rf x264-git rm -Rf x264-git
mkdir -p x264-git mkdir -p x264-git
zcat "$<" | (cd x264-git && tar xv --strip-components=1) $(ZCAT) "$<" | (cd x264-git && tar xv --strip-components=1)
$(MOVE) $(MOVE)
.x264: x264 .x264: x264
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment