From: Jaroslav Kysela <perex@perex.cz>
Date: Mon, 18 Jan 2016 16:38:07 +0000 (+0100)
Subject: Makefile.static: do not use bintray cache when environment variable is not defined
X-Git-Tag: v4.2.1~1161
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e2d8d56837e291f34c4c54f09974bb1544f33eff;p=thirdparty%2Ftvheadend.git

Makefile.static: do not use bintray cache when environment variable is not defined
---

diff --git a/Makefile.static b/Makefile.static
index 319569fd5..f645dc3ac 100644
--- a/Makefile.static
+++ b/Makefile.static
@@ -33,9 +33,10 @@
 #
 # Optional inputs
 #
-#   BINTRAY_USER	- The bintray user account for uploads
+#   BINTRAY_CACHE - Use cached builds from bintray
+#   BINTRAY_USER  - The bintray user account for uploads
 #   BINTRAY_PASS  - The bintray password
-#   BINTRAY_REPO	- The repo to upload to
+#   BINTRAY_REPO  - The repo to upload to
 #
 
 MAKEFILE ?= $(firstword $(MAKEFILE_LIST))
@@ -48,6 +49,7 @@ export CODENAME
 export ROOTDIR
 export BUILDDIR
 export LIBDIR
+export BINTRAY_CACHE
 export BINTRAY_USER
 export BINTRAY_PASS
 export BINTRAY_REPO
@@ -55,13 +57,17 @@ export BINTRAY_REPO
 # Download cache
 .PHONY: libcacheget
 libcacheget:
-	@($(ROOTDIR)/support/lib.sh download $(LIB_NAME) &&\
-	$(ROOTDIR)/support/lib.sh unpack $(LIB_NAME) ) || true
+ifneq ($(BINTRAY_CACHE),)
+	@( $(ROOTDIR)/support/lib.sh download $(LIB_NAME) &&\
+	 $(ROOTDIR)/support/lib.sh unpack $(LIB_NAME) ) || true
+endif
 
 # Upload
 .PHONY: libcacheput
 libcacheput: build
+ifneq ($(BINTRAY_USER),)
 	@$(ROOTDIR)/support/lib.sh upload $(LIB_NAME) $(LIB_FILES)
+endif
 
 # Do it all
 .PHONY: liball