vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Wed Jul 6 20:43:15 2011 +0300| [606d765b98790d80e4a6b32666e7c8275f62d1ba] | committer: Rémi Denis-Courmont
Revert "contrib: fixed shasum execution, which uses a slightly different syntax than sha512sum" $(SRC) is relative to the build directory. Syntax is wrong. This reverts commit adeed33e7b26bb9ad7d0634d192c285ccd4f4635. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=606d765b98790d80e4a6b32666e7c8275f62d1ba --- contrib/src/main.mak | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/src/main.mak b/contrib/src/main.mak index 03a3fe9..140b0f3 100644 --- a/contrib/src/main.mak +++ b/contrib/src/main.mak @@ -137,9 +137,9 @@ download = $(error Neither curl nor wget found!) endif ifeq ($(shell sha512sum --version >/dev/null 2>&1 || echo FAIL),) -SHA512SUM = sha512sum --check - < +SHA512SUM = sha512sum else ifeq ($(shell shasum --version >/dev/null 2>&1 || echo FAIL),) -SHA512SUM = shasum -a 512 --check +SHA512SUM = shasum -a 512 else SHA512SUM = $(error SHA-512 checksumming not found!) endif @@ -177,8 +177,8 @@ download_git = \ (cd $(dir $@) && \ tar cvJ $(notdir $(@:.tar.xz=))) > $@ && \ rm -Rf $(@:.tar.xz=) -checksum = (cd $(TARBALLS) && $(1) \ - $(SRC)/$(patsubst .sum-%,%,$@)/$(2)SUMS ) +checksum = (cd $(TARBALLS) && $(1) --check -) < \ + $(SRC)/$(patsubst .sum-%,%,$@)/$(2)SUMS CHECK_SHA512 = $(call checksum,$(SHA512SUM),SHA512) UNPACK = $(RM) -R $@ \ $(foreach f,$(filter %.tar.gz %.tgz,$^), && tar xvzf $(f)) \ _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
