Merge branch 'master' into 9998-unsigned_manifest

[arvados.git] / build / package-build-dockerfiles / Makefile

diff --git a/build/package-build-dockerfiles/Makefile b/build/package-build-dockerfiles/Makefile
index 9216f8264bc7eef940fe6a3a1a3dcf147def239f..9987e9e0eb8565e7211c70a29384befd5d9ab2d5 100644 (file)
--- a/build/package-build-dockerfiles/Makefile
+++ b/build/package-build-dockerfiles/Makefile
@@ -1,12 +1,8 @@
-all: centos6/generated debian7/generated debian8/generated ubuntu1204/generated ubuntu1404/generated
+all: centos7/generated debian8/generated ubuntu1204/generated ubuntu1404/generated
 
-centos6/generated: common-generated-all
-       test -d centos6/generated || mkdir centos6/generated
-       cp -rlt centos6/generated common-generated/*
-
-debian7/generated: common-generated-all
-       test -d debian7/generated || mkdir debian7/generated
-       cp -rlt debian7/generated common-generated/*
+centos7/generated: common-generated-all
+       test -d centos7/generated || mkdir centos7/generated
+       cp -rlt centos7/generated common-generated/*
 
 debian8/generated: common-generated-all
        test -d debian8/generated || mkdir debian8/generated
@@ -20,10 +16,12 @@ ubuntu1404/generated: common-generated-all
        test -d ubuntu1404/generated || mkdir ubuntu1404/generated
        cp -rlt ubuntu1404/generated common-generated/*
 
-common-generated-all: common-generated/golang-amd64.tar.gz
+GOTARBALL=go1.7.1.linux-amd64.tar.gz
+
+common-generated-all: common-generated/$(GOTARBALL)
 
-common-generated/golang-amd64.tar.gz: common-generated
-       wget -cqO common-generated/golang-amd64.tar.gz http://storage.googleapis.com/golang/go1.4.2.linux-amd64.tar.gz
+common-generated/$(GOTARBALL): common-generated
+       wget -cqO common-generated/$(GOTARBALL) http://storage.googleapis.com/golang/$(GOTARBALL)
 
 common-generated:
        mkdir common-generated