# HG changeset patch # User Volker Grabsch # Date 1286281339 -7200 # Node ID 52c5fde5dc6c80e65b3fe97f1aacda04590f2a21 # Parent e285a1c4ab032493e561a7ed626d9b5b38f07d3e# Parent 406970e1c795d9eacf4fe689ffd4c32e4e40f171 merge diff -r e285a1c4ab03 -r 52c5fde5dc6c Makefile --- a/Makefile Tue Oct 05 12:52:28 2010 +0200 +++ b/Makefile Tue Oct 05 14:22:19 2010 +0200 @@ -38,10 +38,9 @@ $(if $(filter %.tgz, $(1)),tar xzf '$(1)', \ $(if $(filter %.tar.gz, $(1)),tar xzf '$(1)', \ $(if $(filter %.tar.bz2, $(1)),tar xjf '$(1)', \ - $(if $(filter %.bz2, $(1)),tar xjf '$(1)', \ $(if $(filter %.tar.lzma,$(1)),xz -dc -F lzma '$(1)' | tar xf -, \ $(if $(filter %.zip, $(1)),unzip -q '$(1)', \ - $(error Unknown archive format: $(1)))))))) + $(error Unknown archive format: $(1))))))) UNPACK_PKG_ARCHIVE = \ $(call UNPACK_ARCHIVE,$(PKG_DIR)/$($(1)_FILE))