]> git.openstreetmap.org Git - nominatim.git/commitdiff
use properly cascading make for external make file
authorSarah Hoffmann <lonvia@denofr.de>
Mon, 13 Feb 2017 20:02:49 +0000 (21:02 +0100)
committerSarah Hoffmann <lonvia@denofr.de>
Mon, 13 Feb 2017 20:02:49 +0000 (21:02 +0100)
If make is called directly then the -j option is not
properly propagated. Instead make gives a warning
'No jobserver avilable'.

module/CMakeLists.txt

index f4fabe42922ff8e376fdaeaa88ce9815e876dc64..318e56501db660f1a1a4568772f89e93f58aa464 100644 (file)
@@ -1,6 +1,6 @@
 # just use the pgxs makefile
 ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/dummy
 # just use the pgxs makefile
 ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/dummy
-        COMMAND PGXS=${PGXS} PG_CONFIG=${PG_CONFIG} MODSRCDIR=${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_MAKE_PROGRAM} -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}"
         )
 
         COMMENT "Running external makefile ${PGXS}"
         )