From 68ab062cde13a8a0740a5916d3c3f248a22d89c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Tue, 24 May 2016 13:40:53 +0200
Subject: [PATCH] Make build configuration (kickstart) configurable

QubesOS/qubes-issues#1926
---
 Makefile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 3feb1cf..826dd32 100644
--- a/Makefile
+++ b/Makefile
@@ -31,6 +31,9 @@ else
 endif
 PUNGI_OPTS += --ver="$(ISO_VERSION)"
 
+INSTALLER_KICKSTART ?= $(PWD)/conf/qubes-kickstart.cfg
+LIVE_KICKSTART ?= $(PWD)/conf/liveusb.ks
+
 help:
 	@echo "make iso              <== \o/";\
 	    echo; \
@@ -53,7 +56,7 @@ iso-prepare:
 
 iso-installer: iso-prepare
 	mkdir -p work
-	pushd work && pungi --name=Qubes  $(PUNGI_OPTS) -c $(PWD)/conf/qubes-kickstart.cfg && popd
+	pushd work && pungi --name=Qubes  $(PUNGI_OPTS) -c $(INSTALLER_KICKSTART) && popd
 	# Move result files to known-named directories
 	mkdir -p build/ISO/qubes-x86_64/iso build/work
 	mv work/$(ISO_VERSION)/x86_64/iso/*-DVD.iso build/ISO/qubes-x86_64/iso/
@@ -62,7 +65,7 @@ iso-installer: iso-prepare
 	chown --reference=Makefile -R build yum
 	rm -rf work
 
-iso-liveusb: conf/liveusb.ks iso-prepare
+iso-liveusb: $(LIVE_KICKSTART) iso-prepare
 	mkdir -p work
 	pushd work && ../livecd-creator-qubes --debug --product='Qubes OS' --title="Qubes OS $(ISO_VERSION)" --fslabel="Qubes-$(ISO_VERSION)-x86_64-LIVE" --config ../$< && popd
 	# Move result files to known-named directories