Merge pull request #3552 from lonvia/drop-some-migrations

[nominatim.git] / cmake / tool.tmpl

diff --git a/cmake/tool.tmpl b/cmake/tool.tmpl
index 43646792d19d8824753a331f39b3111fa1d6f357..4053ca35b8ec4745360df03e3d1dcaf46e3bafc2 100755 (executable)
--- a/cmake/tool.tmpl
+++ b/cmake/tool.tmpl
@@ -2,13 +2,12 @@
 import sys
 import os
 
 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',
 
 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'))