set CONST_LibDir directly from the source scripts

Now that the source scripts have been moved to \lib, they
can determine the position of the PHP library relative to
themselves.

diff --git a/cmake/script.tmpl b/cmake/script.tmpl
index 8e72cc08bc074c37cae2ca9f6f25427c883a2d55..b0e1f535bfa53f7aa4c5065c50cb4ddf6ca85d54 100755 (executable)
--- a/cmake/script.tmpl
+++ b/cmake/script.tmpl
@@ -3,7 +3,6 @@
 @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_LibDir', '@CMAKE_SOURCE_DIR@/lib');
 @define('CONST_DataDir', '@CMAKE_SOURCE_DIR@');
 
-require_once(CONST_LibDir.'/admin/@script_source@');
+require_once('@CMAKE_SOURCE_DIR@/lib/admin/@script_source@');

diff --git a/lib/admin/check_import_finished.php b/lib/admin/check_import_finished.php
index bd5d7a00216a20e76dacfcc5b28feeda419193e1..f189fc9af0a49588447bef74f2521390e09f9adb 100644 (file)
--- a/lib/admin/check_import_finished.php
+++ b/lib/admin/check_import_finished.php
@@ -1,4 +1,5 @@
 <?php
+@define('CONST_LibDir', dirname(dirname(__FILE__)));
 
 require_once(CONST_LibDir.'/init-cmd.php');
 
@@ -18,7 +19,6 @@ $print_fail = function ($message = 'Failed') use ($term_colors) {
     echo $term_colors['red'].$message.$term_colors['normal']."\n";
 };
 
-
 $oDB = new Nominatim\DB;
 
 

diff --git a/lib/admin/country_languages.php b/lib/admin/country_languages.php
index 1a7ea61636b89de06d0d8455ccbb63feccecb3f5..95043d24b2c6a8821363f5e81fd3a66f76c08d83 100644 (file)
--- a/lib/admin/country_languages.php
+++ b/lib/admin/country_languages.php
@@ -1,4 +1,5 @@
 <?php
+@define('CONST_LibDir', dirname(dirname(__FILE__)));
 
 require_once(CONST_LibDir.'/init-cmd.php');
 

diff --git a/lib/admin/export.php b/lib/admin/export.php
index ae18891ea9a4f79c45f935b35788d53300625d83..b038cf2a7752832449df94669f84b77566cd3039 100644 (file)
--- a/lib/admin/export.php
+++ b/lib/admin/export.php
@@ -1,4 +1,5 @@
 <?php
+    @define('CONST_LibDir', dirname(dirname(__FILE__)));
     // Script to extract structured city and street data
     // from a running nominatim instance as CSV data
 

diff --git a/lib/admin/query.php b/lib/admin/query.php
index 429b30ff30117427e30f9b4ce51fe015bc965300..beb2f9ef32c034e516aaad8266b932d685b03745 100644 (file)
--- a/lib/admin/query.php
+++ b/lib/admin/query.php
@@ -1,4 +1,5 @@
 <?php
+@define('CONST_LibDir', dirname(dirname(__FILE__)));
 
 require_once(CONST_LibDir.'/init-cmd.php');
 require_once(CONST_LibDir.'/Geocode.php');

diff --git a/lib/admin/setup.php b/lib/admin/setup.php
index 713fe561b38df95ce87d462e3ec98f9f4cd28bfe..e5ba61ebcf72ad00e4febd95d477d5aed9f41ed4 100644 (file)
--- a/lib/admin/setup.php
+++ b/lib/admin/setup.php
@@ -1,4 +1,5 @@
 <?php
+@define('CONST_LibDir', dirname(dirname(__FILE__)));
 
 require_once(CONST_LibDir.'/init-cmd.php');
 require_once(CONST_LibDir.'/setup/SetupClass.php');

diff --git a/lib/admin/specialphrases.php b/lib/admin/specialphrases.php
index b1df64360acb9eda20c7afb34d01eb64171bce3b..8d2d91296e8231ec35dd7e558952b6c3864c1db6 100644 (file)
--- a/lib/admin/specialphrases.php
+++ b/lib/admin/specialphrases.php
@@ -1,4 +1,5 @@
 <?php
+@define('CONST_LibDir', dirname(dirname(__FILE__)));
 
 require_once(CONST_LibDir.'/init-cmd.php');
 ini_set('memory_limit', '800M');

diff --git a/lib/admin/update.php b/lib/admin/update.php
index 931ca179819cd9b8577062dca3ac9785069c0c67..50f611d71aa9ab7c9294cc649f7394eb030703ff 100644 (file)
--- a/lib/admin/update.php
+++ b/lib/admin/update.php
@@ -1,4 +1,5 @@
 <?php
+@define('CONST_LibDir', dirname(dirname(__FILE__)));
 
 require_once(CONST_LibDir.'/init-cmd.php');
 require_once(CONST_LibDir.'/setup_functions.php');

diff --git a/lib/admin/warm.php b/lib/admin/warm.php
index 0d8260f199ceaa0c411f0a7436650f93c23ef60b..f0daab36a039a90f82bc6be6c1f7bddc0b2c113f 100644 (file)
--- a/lib/admin/warm.php
+++ b/lib/admin/warm.php
@@ -1,4 +1,5 @@
 <?php
+@define('CONST_LibDir', dirname(dirname(__FILE__)));
 
 require_once(CONST_LibDir.'/init-cmd.php');
 require_once(CONST_LibDir.'/log.php');