[Libreoffice-commits] core.git: Makefile.fetch

[David Tardon]

 Makefile.fetch |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 5409010efc6d7f81d2e87e6156a6bd0604355d24
Author: David Tardon <dtardon at redhat.com>
Date:   Thu May 15 08:23:15 2014 +0200

    fix downloading unowinreg.dll
    
    Change-Id: I24b30ce4f53894796cadd9164f2930523a5f1123

diff --git a/Makefile.fetch b/Makefile.fetch
index 3683fdf..b9f500f 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -51,15 +51,19 @@ define fetch_Download__is_checksum
 $(filter 32,$(words $(shell echo $(1) | sed -e 's/./& /g')))
 endef
 
+define fetch_Download__subst_var
+$(subst _DLL,_MD5SUM,$(subst _TARBALL,_MD5SUM,$(subst _PACK,_MD5SUM,$(1))))
+endef
+
 # fetch_Download_item url variable-name
 define fetch_Download_item
 $(if $(strip $($(2))),,$(error fetch__Download_item: $(2) is empty))
-$(if $(filter undefined,$(origin $(subst _TARBALL,_MD5SUM,$(subst _PACK,_MD5SUM,$(2))))),\
+$(if $(filter undefined,$(origin $(call fetch_Download__subst_var,$(2)))),\
 	$(if $(call fetch_Download__is_checksum,$(firstword $(subst -, ,$($(2))))),\
 		$(call fetch__Download_item,$1,$($2),$(firstword $(subst -, ,$($(2))))),\
-		$(error "fetch_Download_item: no checksum found for $($(2)). Please define $(subst _TARBALL,_MD5SUM,$(subst _PACK,_MD5SUM,$(2))) in download.lst.") \
+		$(error "fetch_Download_item: no checksum found for $($(2)). Please define $(call fetch_Download__subst_var,$(2)) in download.lst.") \
 	),\
-	$(call fetch__Download_item,$(1),$($2),$($(subst _TARBALL,_MD5SUM,$(subst _PACK,_MD5SUM,$(2))))) \
+	$(call fetch__Download_item,$(1),$($2),$($(call fetch_Download__subst_var,$(2)))) \
 )
 
 endef