From a37ffed057b920c00ecdd86b9d037c9ca9719177 Mon Sep 17 00:00:00 2001 From: Christopher Spinrath <christopher.spinrath@rwth-aachen.de> Date: Tue, 30 Sep 2014 01:07:56 +0200 Subject: [PATCH] config: read configurable options from defaults settings --- Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 7d25a69..1961c47 100644 --- a/Makefile +++ b/Makefile @@ -4,9 +4,8 @@ CONFIG_FILE=$(CURDIR)/config/Makefile.conf include $(CONFIG_FILE_DEFAULTS) include $(CONFIG_FILE) -#list of offically supported config options; they should have a default value in CONFIG_FILE_DEFAULTS -CONFIGURABLE=PRIMARY_ARCH SECONDARY_ARCH WORKSPACE ISO_BASE_URL ISO_RELEASE ISO_VERSION ISO_FLAVOR \ - IMAGE_GIT_URL IMAGE_GIT_BRANCH +#read all offically config options from CONFIG_FILE_DEFAULTS +CONFIGURABLE=$(shell cat "$(CONFIG_FILE_DEFAULTS)" | grep -v "^\#" | cut -s -d"=" -f1) ifndef ARCH ARCH=$(PRIMARY_ARCH) -- GitLab