Merge remote-tracking branch 'upstream/master'

[nominatim.git] / cmake / tool.tmpl

diff --git a/cmake/tool.tmpl b/cmake/tool.tmpl
index 43646792d19d8824753a331f39b3111fa1d6f357..fff8231c6b5880e09cbb00fd360341a2f1bfa762 100755 (executable)
--- a/cmake/tool.tmpl
+++ b/cmake/tool.tmpl
@@ -1,14 +1,13 @@
-#!/usr/bin/env python3
+#!/srv/nominatim.openstreetmap.org/venv/bin/python3
 import sys
 import os
 
-sys.path.insert(1, '@CMAKE_SOURCE_DIR@')
+sys.path.insert(1, '@CMAKE_SOURCE_DIR@/src')
 
-os.environ['NOMINATIM_NOMINATIM_TOOL'] = __file__
+from nominatim_db import cli
+from nominatim_db import version
 
-from nominatim import cli
+version.GIT_COMMIT_HASH = '@GIT_HASH@'
 
 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@'))
+                   osm2pgsql_path='@CMAKE_BINARY_DIR@/osm2pgsql/osm2pgsql'))