slightly improve Makefiles

funbringer · funbringer · commit 90c48a57119e · 2017-06-02T15:04:12.000+03:00
diff --git a/Makefile b/Makefile
@@ -10,7 +10,7 @@ OBJS = src/init.o src/relation_info.o src/utils.o src/partition_filter.o \
 	src/compat/pg_compat.o src/compat/relation_tags.o src/compat/expand_rte_hook.o \
 	src/compat/rowmarks_fix.o $(WIN32RES)
 
-PG_CPPFLAGS = -I$(CURDIR)/src/include
+override PG_CPPFLAGS += -I$(CURDIR)/src/include
 
 EXTENSION = pg_pathman
 
diff --git a/tests/cmocka/Makefile b/tests/cmocka/Makefile
@@ -7,6 +7,7 @@ CFLAGS += -I$(CURDIR)/../../src/include
 CFLAGS += $(shell $(PG_CONFIG) --cflags_sl)
 CFLAGS += $(shell $(PG_CONFIG) --cflags)
 CFLAGS += $(CFLAGS_SL)
+CFLAGS += $(PG_CPPFLAGS)
 LDFLAGS = -lcmocka
 TEST_BIN = rangeset_tests
 
diff --git a/travis/pg-travis-test.sh b/travis/pg-travis-test.sh
@@ -126,7 +126,7 @@ LD_LIBRARY_PATH=/usr/local/lib
 export LD_LIBRARY_PATH
 
 # run cmocka tests (using CFLAGS_SL for gcov)
-make USE_PGXS=1 PG_CONFIG=$config_path CFLAGS_SL="$($config_path --cflags_sl) -coverage" cmocka_tests || status=$?
+make USE_PGXS=1 PG_CONFIG=$config_path PG_CPPFLAGS="-coverage" cmocka_tests || status=$?
 
 # remove useless gcov files
 rm -f tests/cmocka/*.gcno
