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 0b245dbbe74b6dd43e34dfaaa6418aaa559cb570..a6384f148ef2e5369692f4d9ec89a9de570ac98c 100644 (file)
--- a/cmake/tool-installed.tmpl
+++ b/cmake/tool-installed.tmpl
@@ -4,14 +4,10 @@ import os
 
 sys.path.insert(1, '@NOMINATIM_LIBDIR@/lib-python')
 
 
 sys.path.insert(1, '@NOMINATIM_LIBDIR@/lib-python')
 

-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='@NOMINATIM_LIBDIR@/module',
 
 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'))