Pick up any extra -I options for Python build.

diff --git a/src/interfaces/python/GNUmakefile b/src/interfaces/python/GNUmakefile
index 840a51df879b52ae362960e7ffeecc64d2cb3ae0..49bb09bec5ec500628f45b3f676780e1f78cacb9 100644 (file)
--- a/src/interfaces/python/GNUmakefile
+++ b/src/interfaces/python/GNUmakefile
@@ -29,7 +29,7 @@ Setup.in: Setup.in.raw
        sed -e 's,@libpq_srcdir@,$(libpq_srcdir),g' \
            -e 's,@libpq_builddir@,$(libpq_builddir),g' \
            -e 's%@EXTRA_LIBS@%$(filter -L%, $(LDFLAGS)) $(LIBS)%g' \
-           -e 's,@pg_includedir@,$(top_srcdir)/src/include,g' \
+           -e 's%@INCLUDES@%$(filter -I%, $(CPPFLAGS))%g' \
            $< > $@
 
 install: all

diff --git a/src/interfaces/python/Setup.in.raw b/src/interfaces/python/Setup.in.raw
index 9c26d73968c985f97d7e8ed1a92a2400f8ef031c..e52c2a4a280215140a90bff9032516ab624c8c2a 100644 (file)
--- a/src/interfaces/python/Setup.in.raw
+++ b/src/interfaces/python/Setup.in.raw
@@ -1,3 +1,3 @@
 *shared*
 
-_pg  pgmodule.c -I@libpq_srcdir@ -I@pg_includedir@ -L@libpq_builddir@ -lpq @EXTRA_LIBS@
+_pg  pgmodule.c -I@libpq_srcdir@ @INCLUDES@ -L@libpq_builddir@ -lpq @EXTRA_LIBS@