provide srcdir for postgres module in VPATH and CPPFLAGS

The pgxs makefile in Postgres <= 9.2 cannot yet handle VPATH
correctly. Provide header paths explicitly and overwrite
VPATH after sourcing the pgxs file.

Fixes #454.

diff --git a/module/Makefile b/module/Makefile
index 78b395a564daf91600332694afebbd0d4dba317c..dd037a01bfae8514e8d16e67851137749abf1957 100644 (file)
--- a/module/Makefile
+++ b/module/Makefile
@@ -1,7 +1,9 @@
 MODULES = nominatim
 MODULES = nominatim

-VPATH = $(MODSRCDIR)
+PG_CPPFLAGS = -I$(MODSRCDIR)

 include $(PGXS)
 
 include $(PGXS)
 

+VPATH = $(MODSRCDIR)
+

 all:
        chmod 755 nominatim.so
 
 all:
        chmod 755 nominatim.so