Rebase with master

[nominatim.git] / cmake / script.tmpl

diff --git a/cmake/script.tmpl b/cmake/script.tmpl
index f0fa2118942e36f4d3aba50e4f7bdef72f16844d..3fbe535e44394cb03f1a411b6d8cc325c16d012a 100755 (executable)
--- a/cmake/script.tmpl
+++ b/cmake/script.tmpl
@@ -4,9 +4,9 @@ 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';