From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 13 Jan 2021 16:00:38 +0000 (+0100)
Subject: set CONST_LibDir directly from the source scripts
X-Git-Tag: v3.7.0~57^2~15
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/e467b956ffbe32acbec2ae0bf7ef029a66f2ede0

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 8e72cc08..b0e1f535 100755
--- 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 bd5d7a00..f189fc9a 100644
--- 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 1a7ea616..95043d24 100644
--- 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 ae18891e..b038cf2a 100644
--- 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 429b30ff..beb2f9ef 100644
--- 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 713fe561..e5ba61eb 100644
--- 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 b1df6436..8d2d9129 100644
--- 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 931ca179..50f611d7 100644
--- 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 0d8260f1..f0daab36 100644
--- 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');