remove unused BINDIR constant

diff --git a/cmake/script.tmpl b/cmake/script.tmpl
index 053e94ae5ac79001f5cac885d69efb172710c7bf..863d79ee41a729d272225dbf7547dd5e14443110 100755 (executable)
--- a/cmake/script.tmpl
+++ b/cmake/script.tmpl
@@ -4,7 +4,6 @@ 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_SqlDir', '@CMAKE_SOURCE_DIR@/lib-sql');
 @define('CONST_ConfigDir', '@CMAKE_SOURCE_DIR@/settings');

diff --git a/lib-php/lib.php b/lib-php/lib.php
index c75bf00abeb9e7851e14d371015a341c52a4554b..6798e74997668896796803f07f2ac0c051029968 100644 (file)
--- a/lib-php/lib.php
+++ b/lib-php/lib.php
@@ -7,7 +7,6 @@ function loadSettings($sProjectDir)
     // the installed scripts. Neither setting is part of the official
     // set of settings.
     defined('CONST_DataDir') or define('CONST_DataDir', $_SERVER['NOMINATIM_DATADIR']);
-    defined('CONST_BinDir') or define('CONST_BinDir', $_SERVER['NOMINATIM_BINDIR']);
     defined('CONST_SqlDir') or define('CONST_SqlDir', $_SERVER['NOMINATIM_SQLDIR']);
     defined('CONST_ConfigDir') or define('CONST_ConfigDir', $_SERVER['NOMINATIM_CONFIGDIR']);
     defined('CONST_Default_ModulePath') or define('CONST_Default_ModulePath', $_SERVER['NOMINATIM_DATABASE_MODULE_SRC_PATH']);

diff --git a/nominatim/tools/exec_utils.py b/nominatim/tools/exec_utils.py
index 23dd8a1de2534292ad4d61b2373405fba5c5b126..541a2b08f05b563b47272795ef82b6239e21413a 100644 (file)
--- a/nominatim/tools/exec_utils.py
+++ b/nominatim/tools/exec_utils.py
@@ -25,7 +25,6 @@ def run_legacy_script(script, *args, nominatim_env=None, throw_on_fail=False):
 
     env = nominatim_env.config.get_os_env()
     env['NOMINATIM_DATADIR'] = str(nominatim_env.data_dir)
-    env['NOMINATIM_BINDIR'] = str(nominatim_env.data_dir / 'utils')
     env['NOMINATIM_SQLDIR'] = str(nominatim_env.sqllib_dir)
     env['NOMINATIM_CONFIGDIR'] = str(nominatim_env.config_dir)
     env['NOMINATIM_DATABASE_MODULE_SRC_PATH'] = nominatim_env.module_dir

diff --git a/test/bdd/steps/nominatim_environment.py b/test/bdd/steps/nominatim_environment.py
index 7032553624e9c146cf945b72961a6b56acf5a91a..d337c0990e3099191aeb727b3a0f0720bd544155 100644 (file)
--- a/test/bdd/steps/nominatim_environment.py
+++ b/test/bdd/steps/nominatim_environment.py
@@ -90,7 +90,6 @@ class NominatimEnvironment:
         self.test_env['NOMINATIM_DATADIR'] = self.src_dir
         self.test_env['NOMINATIM_SQLDIR'] = self.src_dir / 'lib-sql'
         self.test_env['NOMINATIM_CONFIGDIR'] = self.src_dir / 'settings'
-        self.test_env['NOMINATIM_BINDIR'] = self.src_dir / 'utils'
         self.test_env['NOMINATIM_DATABASE_MODULE_SRC_PATH'] = self.build_dir / 'module'
         self.test_env['NOMINATIM_OSM2PGSQL_BINARY'] = self.build_dir / 'osm2pgsql' / 'osm2pgsql'
         self.test_env['NOMINATIM_NOMINATIM_TOOL'] = self.build_dir / 'nominatim'