From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Wed, 11 Mar 2009 11:26:45 +0000 (+0100)
Subject: kernelcfg2mk: Fixed handling of include paths under arch/
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/omk/sssa.git/commitdiff_plain/6698de2315e173f0773d0a9c906babf0436613a2

kernelcfg2mk: Fixed handling of include paths under arch/
---

diff --git a/rules/linux/kernelcfg2mk b/rules/linux/kernelcfg2mk
index c18a497..8459118 100755
--- a/rules/linux/kernelcfg2mk
+++ b/rules/linux/kernelcfg2mk
@@ -151,9 +151,9 @@ flags:
 	@echo LINUX_CROSS_COMPILE="\$(CROSS_COMPILE)" >>\$(obj)/flags
 	@echo LINUX_KERNELRELEASE="\$(KERNELRELEASE)" >>\$(obj)/flags
 ifdef KBUILD_CFLAGS
-	@echo LINUX_CPPFLAGS="\$(KBUILD_CPPFLAGS)" | sed 's#Iinclude#I"\$(LINUXDIR)/include"#g'>>\$(obj)/flags
-	@echo LINUX_AFLAGS="\$(KBUILD_AFLAGS)" | sed 's#Iinclude#I"\$(OMK_LINUX_SRC)/include"#g'>>\$(obj)/flags
-	@echo LINUX_CFLAGS="\$(KBUILD_CFLAGS)" | sed 's#Iinclude#I"\$(OMK_LINUX_SRC)/include"#g'>>\$(obj)/flags
+	@echo LINUX_CPPFLAGS="\$(KBUILD_CPPFLAGS)" | sed 's#-I\(include\|arch\)#-I"\$(LINUXDIR)/\1"#g'>>\$(obj)/flags
+	@echo LINUX_AFLAGS="\$(KBUILD_AFLAGS)" | sed 's#-I\(include\|arch\)#-I"\$(OMK_LINUX_SRC)/\1"#g'>>\$(obj)/flags
+	@echo LINUX_CFLAGS="\$(KBUILD_CFLAGS)" | sed 's#-I\(include\|arch\)#-I"\$(OMK_LINUX_SRC)/\1"#g'>>\$(obj)/flags
 else
 	@echo LINUX_CPPFLAGS="\$(CPPFLAGS)" | sed 's#Iinclude#I"\$(LINUXDIR)/include"#g'>>\$(obj)/flags
 	@echo LINUX_AFLAGS="\$(AFLAGS)" | sed 's#Iinclude#I"\$(OMK_LINUX_SRC)/include"#g'>>\$(obj)/flags