From e6d235f7f2c7282878a21160837b487787a8e94e Mon Sep 17 00:00:00 2001
From: midipix <writeonce@midipix.org>
Date: Feb 14 2016 09:46:12 +0000
Subject: build system: add support for CFLAGS_OS and CFLAGS_SITE.


---

diff --git a/Makefile.in b/Makefile.in
index 2d589c6..b6976c9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -15,6 +15,8 @@ CFLAGS_COMMON 		= @cflags_common@
 CFLAGS_CMDLINE 		= @cflags_cmdline@
 CFLAGS_CONFIG 		= @cflags_config@
 CFLAGS_SYSROOT 		= @cflags_sysroot@
+CFLAGS_OS		= @cflags_os@
+CFLAGS_SITE		= @cflags_site@
 CFLAGS_PATH 		= @cflags_path@
 
 LDFLAGS_DEBUG 		= @ldflags_debug@
@@ -243,6 +245,8 @@ clean:
 		@echo CFLAGS_CMDLINE:'         '$(CFLAGS_CMDLINE)
 		@echo CFLAGS_CONFIG:'          '$(CFLAGS_CONFIG)
 		@echo CFLAGS_SYSROOT:'         '$(CFLAGS_SYSROOT)
+		@echo CFLAGS_OS:'              '$(CFLAGS_OS)
+		@echo CFLAGS_SITE:'            '$(CFLAGS_SITE)
 		@echo CFLAGS_PATH:'            '$(CFLAGS_PATH)
 		@echo
 		@echo LDFLAGS_DEBUG:'           '$(LDFLAGS_DEBUG)
diff --git a/configure b/configure
index 3e222ce..dca0d7e 100755
--- a/configure
+++ b/configure
@@ -56,6 +56,8 @@ init_vars()
 	mb_cflags_cmdline=$CFLAGS_CMDLINE
 	mb_cflags_config=$CFLAGS_CONFIG
 	mb_cflags_sysroot=$CFLAGS_SYSROOT
+	mb_cflags_os=$CFLAGS_OS
+	mb_cflags_site=$CFLAGS_SITE
 	mb_cflags_path=$CFLAGS_PATH
 
 	mb_ldflags=$LDFLAGS
@@ -128,6 +130,8 @@ common_defaults()
 	[ -z "$mb_cflags_cmdline" ]	&& mb_cflags_cmdline=$mb_default_cflags_cmdline
 	[ -z "$mb_cflags_config" ]	&& mb_cflags_config=$mb_default_cflags_config
 	[ -z "$mb_cflags_sysroot" ]	&& mb_cflags_sysroot=$mb_default_cflags_sysroot
+	[ -z "$mb_cflags_os" ]		&& mb_cflags_os=$mb_default_cflags_os
+	[ -z "$mb_cflags_site" ]	&& mb_cflags_site=$mb_default_cflags_site
 	[ -z "$mb_cflags_path" ]	&& mb_cflags_path=$mb_default_cflags_path
 
 	[ -z "$mb_ldflags_debug" ]	&& mb_ldflags_debug=$mb_default_ldflags_debug
@@ -286,6 +290,8 @@ config_copy()
 			-e 's^@cflags_cmdline@^'"$mb_cflags $mb_cflags_cmdline"'^g'	\
 			-e 's^@cflags_config@^'"$mb_cflags_config"'^g'			\
 			-e 's^@cflags_sysroot@^'"$mb_cflags_sysroot"'^g'		\
+			-e 's^@cflags_os@^'"$mb_cflags_os"'^g'				\
+			-e 's^@cflags_site@^'"$mb_cflags_site"'^g'			\
 			-e 's^@cflags_path@^'"$mb_cflags_path"'^g'			\
 											\
 			-e 's^@ldflags@^'"$mb_ldflags"'^g'				\
diff --git a/project/defs.mk b/project/defs.mk
index f089d08..9c36756 100644
--- a/project/defs.mk
+++ b/project/defs.mk
@@ -25,7 +25,7 @@ STATIC_APP	= $(BINDIR)/$(OS_APP_PREFIX)$(PACKAGE)-static$(OS_APP_SUFFIX)
 
 CFLAGS		= $(CFLAGS_DEBUG)  $(CFLAGS_CONFIG)  $(CFLAGS_SYSROOT) \
 		   $(CFLAGS_COMMON) $(CFLAGS_CMDLINE) $(CFLAGS_HOST)	\
-		   $(CFLAGS_PATH)
+		   $(CFLAGS_PATH) $(CFLAGS_OS) $(CFLAGS_SITE)
 
 CFLAGS_SHARED	= $(CFLAGS) $(CFLAGS_PIC) $(CFLAGS_SHARED_ATTR)
 CFLAGS_STATIC	= $(CFLAGS) $(CFLAGS_OBJ) $(CFLAGS_STATIC_ATTR)