From: Intel <intel.com>
Date: Fri, 8 Nov 2013 02:00:00 +0000 (+0100)
Subject: mk: always preprocess template config file
X-Git-Tag: spdx-start~11103
X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=63baec8781f1053842c7d0ef0ce533bbb03dd022;p=dpdk.git

mk: always preprocess template config file

Signed-off-by: Intel
---

diff --git a/mk/rte.sdkconfig.mk b/mk/rte.sdkconfig.mk
index ace65b09d2..552ba690d1 100644
--- a/mk/rte.sdkconfig.mk
+++ b/mk/rte.sdkconfig.mk
@@ -54,12 +54,9 @@ else
 $(RTE_OUTPUT)/.config: $(RTE_CONFIG_TEMPLATE) FORCE
 	@[ -d $(RTE_OUTPUT) ] || mkdir -p $(RTE_OUTPUT)
 	$(Q)if [ "$(RTE_CONFIG_TEMPLATE)" != "" -a -f "$(RTE_CONFIG_TEMPLATE)" ]; then \
-		if grep -q '#include' $(RTE_CONFIG_TEMPLATE) ; then \
-			$(CPP) -undef -C -P -x assembler-with-cpp -fdirectives-only \
-			-o $(RTE_OUTPUT)/.config_tmp $(RTE_CONFIG_TEMPLATE) ; \
-		else \
-			cp $(RTE_CONFIG_TEMPLATE) $(RTE_OUTPUT)/.config_tmp ; \
-		fi ; \
+		$(CPP) -undef -P -x assembler-with-cpp \
+		-fdirectives-only -ffreestanding \
+		-o $(RTE_OUTPUT)/.config_tmp $(RTE_CONFIG_TEMPLATE) ; \
 		if ! cmp -s $(RTE_OUTPUT)/.config_tmp $(RTE_OUTPUT)/.config; then \
 			cp $(RTE_OUTPUT)/.config_tmp $(RTE_OUTPUT)/.config ; \
 		fi ; \