Merge remote-tracking branch 'upstream/master'

[nominatim.git] / cmake / tool.tmpl

diff --git a/cmake/tool.tmpl b/cmake/tool.tmpl
index 3bba72c3a585e81d2b44539e64f4a6ff47bf3eab..c1ecd3f03eec002aa686e065c17c6255cc3dd816 100755 (executable)
--- a/cmake/tool.tmpl
+++ b/cmake/tool.tmpl
@@ -4,12 +4,17 @@ import os
 
 sys.path.insert(1, '@CMAKE_SOURCE_DIR@')
 
 
 sys.path.insert(1, '@CMAKE_SOURCE_DIR@')
 

-os.environ['NOMINATIM_NOMINATIM_TOOL'] = __file__
+os.environ['NOMINATIM_NOMINATIM_TOOL'] = os.path.abspath(__file__)

 
 from nominatim import cli
 
 from nominatim import cli

+from nominatim import version
+
+version.GIT_COMMIT_HASH = '@GIT_HASH@'

 
 exit(cli.nominatim(module_dir='@CMAKE_BINARY_DIR@/module',
                    osm2pgsql_path='@CMAKE_BINARY_DIR@/osm2pgsql/osm2pgsql',
 
 exit(cli.nominatim(module_dir='@CMAKE_BINARY_DIR@/module',
                    osm2pgsql_path='@CMAKE_BINARY_DIR@/osm2pgsql/osm2pgsql',

-                   phplib_dir='@CMAKE_SOURCE_DIR@/lib',
-                   data_dir='@CMAKE_SOURCE_DIR@',
+                   phplib_dir='@CMAKE_SOURCE_DIR@/lib-php',
+                   sqllib_dir='@CMAKE_SOURCE_DIR@/lib-sql',
+                   data_dir='@CMAKE_SOURCE_DIR@/data',
+                   config_dir='@CMAKE_SOURCE_DIR@/settings',

                    phpcgi_path='@PHPCGI_BIN@'))
                    phpcgi_path='@PHPCGI_BIN@'))