Separate CFLAGS and CPPFLAGS. CFLAGS should not contain preprocessor
directives, which is the role of CPPFLAGS. Closes SF patch #414991.
diff --git a/Demo/embed/Makefile b/Demo/embed/Makefile
index ebc274f..bdb381e 100644
--- a/Demo/embed/Makefile
+++ b/Demo/embed/Makefile
@@ -15,7 +15,8 @@
# Compiler flags
OPT= -g
INCLUDES= -I$(srcdir)/Include -I$(blddir)
-CFLAGS= $(OPT) $(INCLUDES)
+CFLAGS= $(OPT)
+CPPFLAGS= $(INCLUDES)
# The Python library
LIBPYTHON= $(blddir)/libpython$(VERSION).a
diff --git a/Demo/pysvr/Makefile b/Demo/pysvr/Makefile
index 7e36553..cb6605f 100644
--- a/Demo/pysvr/Makefile
+++ b/Demo/pysvr/Makefile
@@ -31,7 +31,8 @@
OTHERLIBS=-lnsl -lpthread -ldl -lm -ldb -lutil
# Compilation and link flags -- no need to change normally
-CFLAGS=$(PYINCL) $(OPT)
+CFLAGS=$(OPT)
+CPPFLAGS=$(PYINCL)
LIBS=$(PYLIBS) $(RLLIBS) $(OTHERLIBS)
# Default port for the pysvr application