changeset 3158:e0beeba4490f

Use bsdcpio to extract proj files in native mingw * Makefile.in: add filter rule for untaring proj-(VERSION).tar.gz, add qrupdate_VERSION to rule for unpacking qrupdate.
author John Donoghue <john.donoghue@ieee.org>
date Sun, 21 Jul 2013 08:57:33 -0400
parents 591b3d68b43e
children 75eaca7603d8
files Makefile.in
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.in	Sat Jul 20 22:41:16 2013 -0400
+++ b/Makefile.in	Sun Jul 21 08:57:33 2013 -0400
@@ -290,14 +290,15 @@
 
 ifeq ($(MXE_NATIVE_MINGW_BUILD),yes)
 UNPACK_ARCHIVE = \
-    $(if $(filter %rupdate-1.1.2.tar.gz,     $(1)),bsdcpio -id < '$(1)', \
+    $(if $(filter %rupdate-$(qrupdate_VERSION).tar.gz,     $(1)),bsdcpio -id < '$(1)', \
+    $(if $(filter %roj-$(proj_VERSION).tar.gz,     $(1)),bsdcpio -id < '$(1)', \
     $(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 %.tar.lzma,$(1)),xz -dc -F lzma '$(1)' | tar xf -, \
     $(if $(filter %.tar.xz,$(1)),xz -dc '$(1)' | tar xf -, \
     $(if $(filter %.zip,     $(1)),unzip -q '$(1)', \
-    $(error Unknown archive format for $(2): $(1)))))))))
+    $(error Unknown archive format for $(2): $(1))))))))))
 else
 UNPACK_ARCHIVE = \
     $(if $(filter %.tgz,     $(1)),tar xzf '$(1)', \