Merge remote-tracking branch 'upstream/master'

[nominatim.git] / cmake / tool-installed.tmpl

diff --git a/cmake/tool-installed.tmpl b/cmake/tool-installed.tmpl
index 8825daaf9b3b1599f67ac4bff156b602b29954fd..47c17f416b29a5d508d238569591c9b44edb21a9 100644 (file)
--- a/cmake/tool-installed.tmpl
+++ b/cmake/tool-installed.tmpl
@@ -1,20 +1,13 @@
-#!/usr/bin/env python3
+#!/srv/nominatim.openstreetmap.org/venv/bin/python3

 import sys
 import os
 
 sys.path.insert(1, '@NOMINATIM_LIBDIR@/lib-python')
 
 import sys
 import os
 
 sys.path.insert(1, '@NOMINATIM_LIBDIR@/lib-python')
 

-os.environ['NOMINATIM_NOMINATIM_TOOL'] = os.path.abspath(__file__)
-
-from nominatim import cli
-from nominatim import version
+from nominatim_db import cli
+from nominatim_db import version

 
 version.GIT_COMMIT_HASH = '@GIT_HASH@'
 
 exit(cli.nominatim(module_dir='@NOMINATIM_LIBDIR@/module',
 
 version.GIT_COMMIT_HASH = '@GIT_HASH@'
 
 exit(cli.nominatim(module_dir='@NOMINATIM_LIBDIR@/module',

-                   osm2pgsql_path='@NOMINATIM_LIBDIR@/osm2pgsql',
-                   phplib_dir='@NOMINATIM_LIBDIR@/lib-php',
-                   sqllib_dir='@NOMINATIM_LIBDIR@/lib-sql',
-                   data_dir='@NOMINATIM_DATADIR@',
-                   config_dir='@NOMINATIM_CONFIGDIR@',
-                   phpcgi_path='@PHPCGI_BIN@'))
+                   osm2pgsql_path='@NOMINATIM_LIBDIR@/osm2pgsql'))