From df9be04a209d1d1620a5c764bb7416067da1e603 Mon Sep 17 00:00:00 2001 From: James Laska Date: Mon, 3 Feb 2014 13:52:00 -0500 Subject: [PATCH] Require LICENSE_TIER to specify the license filename Previously, LICENSE_TIER was used to generate the license file by appending '.json'. --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 90495a542e..c2ec58490c 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ VERSION=$(shell $(PYTHON) -c "from awx import __version__; print(__version__.spl RELEASE=$(shell $(PYTHON) -c "from awx import __version__; print(__version__.split('-')[1])") # Allow AMI license customization -LICENSE_TIER ?= 10 +LICENSE_TIER ?= 10.json ifneq ($(OFFICIAL),yes) BUILD=dev$(DATE) @@ -197,7 +197,7 @@ deb: sdist (cd $(DEB_BUILD_DIR) && PKG_RELEASE=$(DEB_PKG_RELEASE) dpkg-buildpackage -nc -us -uc -b --changes-option="-fdebian/realfiles") ami: - (cd packaging/ami && $(PACKER) build $(PACKER_BUILD_OPTS) -var "aws_license=$(LICENSE_TIER).json" ansible-tower.json) + (cd packaging/ami && $(PACKER) build $(PACKER_BUILD_OPTS) -var "aws_license=$(LICENSE_TIER)" ansible-tower.json) install: $(PYTHON) setup.py install egg_info -b ""