clean up ST_DWithin and intersects() functions

[nominatim.git] / cmake / tool.tmpl

diff --git a/cmake/tool.tmpl b/cmake/tool.tmpl
index 67d57ad7e270a11c5cad5b8e304208bdbbb4fa69..fcdbe899295e4b207d72d68f779fdb2caa79e17a 100755 (executable)
--- a/cmake/tool.tmpl
+++ b/cmake/tool.tmpl
@@ -4,12 +4,10 @@ import os
 
 sys.path.insert(1, '@CMAKE_SOURCE_DIR@')
 
 
 sys.path.insert(1, '@CMAKE_SOURCE_DIR@')
 

-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',
 
 exit(cli.nominatim(module_dir='@CMAKE_BINARY_DIR@/module',

-                   osm2pgsql_path='@CMAKE_BINARY_DIR@/osm2pgsql/osm2pgsql',
-                   phplib_dir='@CMAKE_SOURCE_DIR@/lib-php',
-                   data_dir='@CMAKE_SOURCE_DIR@',
-                   phpcgi_path='@PHPCGI_BIN@'))
+                   osm2pgsql_path='@CMAKE_BINARY_DIR@/osm2pgsql/osm2pgsql'))