summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorManuel Messner2018-02-20 10:46:58 +0100
committerManuel Messner2018-02-20 10:46:58 +0100
commit8277de7ffdf0e4e757e394f1c384560336ce1bfe (patch)
tree2e577a389b36df8289ed7664db37968c42ab85b6 /Makefile
parentMakefile: indent all variable definitions in the same way (diff)
downloadpacker-templates-8277de7ffdf0e4e757e394f1c384560336ce1bfe.tar.gz
packer-templates-8277de7ffdf0e4e757e394f1c384560336ce1bfe.tar.xz
packer-templates-8277de7ffdf0e4e757e394f1c384560336ce1bfe.zip
Makefile: PACKER_OPTS: fix variable usage
If PACKER_OPTS are supplied via CLI, they will override the rules defined in the Makefile. To make them work again a 'override' rule needs to be supplied.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index e896904..8deb0a0 100644
--- a/Makefile
+++ b/Makefile
@@ -41,14 +41,14 @@ PROVTARGETS := $(foreach template, $(TEMPLATES), $(foreach flavor, $(FLAVORS), $
BOOTTARGETS := $(foreach template, $(TEMPLATES), $(template)/base/boot)
BOOTTARGETS += $(foreach prov, $(PROVTARGETS), $(prov)/boot)
-PACKER_OPTS += -var-file=base.json
+override PACKER_OPTS += -var-file=base.json
ifdef DEBUG
- VERBOSE := 1
- PACKER_OPTS += -debug
+ VERBOSE := 1
+ override PACKER_OPTS += -debug
endif
ifdef WINDOW
- PACKER_OPTS += -var='headless=false'
+ override PACKER_OPTS += -var='headless=false'
endif
# We support parallel Provisioning packer builds.