X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=eca05f176205105e75e1afc3fefa0113bbe06f4f;hb=1f69d4cc8ef87c6b7228f0825043f39968877f83;hp=603945d95269bec2fa956f9be4b5a8d07e02948b;hpb=2be11db807f1a7726b44ffc41bdcf62da5bb6261;p=drupal.git

diff --git a/Makefile b/Makefile
index 603945d..eca05f1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,35 +1,55 @@
-# $Id$
-CURL	:= curl -H Pragma: -O -R -S --fail --show-error
-SHA1SUM	= sha1sum
-
-# default - overridden by the build
-SPECFILE = drupal.spec
+#
+WEBFETCH := curl -H Pragma: -R -S --fail --show-error
+SHA1SUM	 := sha1sum
 
 version=4.7.11
 
-main.URL	:= http://ftp.drupal.org/files/projects/drupal-$(version).tar.gz
-main.SHA1SUM    := c9f767e6c2cd873c4b0bef1986e2821febfc7e34
+ALL				+= drupal
+# for fedora29
+# this patch is about commenting off one line in settings.php:
+#this causes a php error in fedora29/php7.2
+#ini_set('session.save_handler',     'user');
+drupal-URL1		:= http://mirror.onelab.eu/third-party/drupal-$(version)-patch-php72.tar.gz
+drupal-SHA1SUM  := f99343938b418384859ff2ced0a0870824e73a13
+# so we can no longer use upstream that was here:
+#drupal-URL2	:= http://ftp.drupal.org/files/projects/drupal-$(version).tar.gz
+drupal			:= drupal-$(version).tar.gz
 
-main.FILE	:= $(notdir $(main.URL))
+ALL				+= taxo
+taxo-URL1		:= http://mirror.onelab.eu/third-party/taxonomy_block-4.7.x-1.x-dev.tar.gz
+taxo-SHA1SUM	:= 9d926df1695c0092a74446154b00579d4ccbcb60
+taxo	  		:= $(notdir $(taxo-URL1))
 
-# Thierry - when called from within the build, PWD is /build
-SOURCEFILES := $(main.FILE)
+all: $(ALL)
+.PHONY: all
 
-$(main.FILE): #FORCE
-	@if [ ! -e "$@" ] ; then echo "$(CURL) $(main.URL)" ; $(CURL) $(main.URL) ; fi
-	@if [ ! -e "$@" ] ; then echo "Could not download source file: $@ does not exist" ; exit 1 ; fi
-	@if test "$$(sha1sum $@ | awk '{print $$1}')" != "$(main.SHA1SUM)" ; then \
-	    echo "sha1sum of the downloaded $@ does not match the one from 'sources' file" ; \
-	    echo "Local copy: $$(sha1sum $@)" ; \
-	    echo "In sources: $(main.SHA1SUM)" ; \
-	    exit 1 ; \
+##############################
+define download_target
+$(1): $($(1))
+.PHONY: $(1)
+$($(1)):
+	@if [ ! -e "$($(1))" ] ; then $(WEBFETCH) $($(1)-URL1) -o $($(1));  fi
+	@if [ ! -e "$($(1))" ] ; then echo "Could not download source file: $($(1)) does not exist" ; exit 1 ; fi
+	@if test "$$$$($(SHA1SUM) $($(1)) | awk '{print $$$$1}')" != "$($(1)-SHA1SUM)" ; then \
+	    echo "sha1sum of the downloaded $($(1)) does not match the one from 'Makefile'" ; \
+	    echo "Local copy: $$$$($(SHA1SUM) $($(1)))" ; \
+	    echo "In Makefile: $($(1)-SHA1SUM)" ; \
+	    false ; \
 	else \
-	    ls -l $@ ; \
+	    ls -l $($(1)) ; \
 	fi
+endef
+
+$(eval $(call download_target,drupal))
+$(eval $(call download_target,taxo))
 
-sources: $(SOURCEFILES)
+sources: $(ALL)
 .PHONY: sources
 
+####################
+# default - overridden by the build
+SPECFILE = drupal.spec
+
 PWD=$(shell pwd)
 PREPARCH ?= noarch
 RPMDIRDEFS = --define "_sourcedir $(PWD)" --define "_builddir $(PWD)" --define "_srcrpmdir $(PWD)" --define "_rpmdir $(PWD)"