Rebase with master

[nominatim.git] / cmake / script.tmpl

diff --git a/cmake/script.tmpl b/cmake/script.tmpl
index aa25a1248418d064916454880eff55f94a71adf5..3fbe535e44394cb03f1a411b6d8cc325c16d012a 100755 (executable)
--- a/cmake/script.tmpl
+++ b/cmake/script.tmpl
@@ -1,13 +1,14 @@
 #!@PHP_BIN@ -Cq
 <?php
-require('@CMAKE_SOURCE_DIR@/lib/dotenv_loader.php');
+require('@CMAKE_SOURCE_DIR@/lib-php/dotenv_loader.php');
 
 @define('CONST_Default_ModulePath', '@CMAKE_BINARY_DIR@/module');
 @define('CONST_Default_Osm2pgsql', '@CMAKE_BINARY_DIR@/osm2pgsql/osm2pgsql');
-@define('CONST_BinDir', '@CMAKE_SOURCE_DIR@/utils');
-@define('CONST_DataDir', '@CMAKE_SOURCE_DIR@');
+@define('CONST_DataDir', '@CMAKE_SOURCE_DIR@/data');
+@define('CONST_SqlDir', '@CMAKE_SOURCE_DIR@/lib-sql');
+@define('CONST_ConfigDir', '@CMAKE_SOURCE_DIR@/settings');
 
 loadDotEnv();
 $_SERVER['NOMINATIM_NOMINATIM_TOOL'] = '@CMAKE_BINARY_DIR@/nominatim';
 
-require_once('@CMAKE_SOURCE_DIR@/lib/admin/@script_source@');
+require_once('@CMAKE_SOURCE_DIR@/lib-php/admin/@script_source@');