From 8277de7ffdf0e4e757e394f1c384560336ce1bfe Mon Sep 17 00:00:00 2001
From: Manuel Messner
Date: Tue, 20 Feb 2018 10:46:58 +0100
Subject: 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.
---
 Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'Makefile')

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.
-- 
cgit v1.2.3-55-g7522