cmake: use explicit VPATH when calling pgxs makefile

Some postgres installations report problems with the makefile
magic that should look for the source where the Makefile is
located. So hand in the path explicitly via VPATH instead.

Fixes #453.

diff --git a/module/CMakeLists.txt b/module/CMakeLists.txt
index 5e507a9e8eb2ee6037192b779f1e9afa4506b3a4..4dfc477cd8684a30a81791f99f8541c9ed0863b3 100644 (file)
--- a/module/CMakeLists.txt
+++ b/module/CMakeLists.txt
@@ -1,6 +1,6 @@
 # just use the pgxs makefile
 ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/dummy
-        COMMAND PGXS=${PGXS} PG_CONFIG=${PG_CONFIG} make -f ${CMAKE_CURRENT_SOURCE_DIR}/Makefile
+        COMMAND PGXS=${PGXS} PG_CONFIG=${PG_CONFIG} MODSRCDIR=${CMAKE_CURRENT_SOURCE_DIR} make -f ${CMAKE_CURRENT_SOURCE_DIR}/Makefile
         COMMENT "Running external makefile ${PGXS}"
         )
 

diff --git a/module/Makefile b/module/Makefile
index 783a6602b628c099ed25478e3553cc57e3e68e72..78b395a564daf91600332694afebbd0d4dba317c 100644 (file)
--- a/module/Makefile
+++ b/module/Makefile
@@ -1,4 +1,5 @@
 MODULES = nominatim
+VPATH = $(MODSRCDIR)
 include $(PGXS)
 
 all: