From: Sarah Hoffmann <lonvia@denofr.de>
Date: Thu, 23 Aug 2018 18:41:44 +0000 (+0200)
Subject: Merge branch 'customPHP1' of https://github.com/ThomasBarris/Nominatim into ThomasBar... 
X-Git-Tag: v3.2.0~9
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/57bf76a0e1d766bc90afcb8a748c5e25e7aa6f08?hp=c80c80200c0c2e78811d0b96e225406471e0ad48

Merge branch 'customPHP1' of https://github.com/ThomasBarris/Nominatim into ThomasBarris-customPHP1
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2096c43d..afd81594 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -77,6 +77,16 @@ find_package(BZip2 REQUIRED)
 find_package(LibXml2 REQUIRED)
 include_directories(${LIBXML2_INCLUDE_DIR})
 
+# Setting PHP binary variable as to command line (prevailing) or auto detect
+if (NOT PHP_BIN)
+     find_program (PHP_BIN php)
+endif()
+# sanity check if PHP binary exists
+if (NOT EXISTS ${PHP_BIN})
+    message(FATAL_ERROR "PHP binary not found install php or provide location by -DPHP_BIN=/path/php ")
+endif()
+message (STATUS "Setting PHP_BIN= " ${PHP_BIN})
+
 #-----------------------------------------------------------------------------
 #
 # Setup settings and paths
diff --git a/utils/blocks.php b/utils/blocks.php
index 602df0bc..761ab9e4 100755
--- a/utils/blocks.php
+++ b/utils/blocks.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php -Cq
+#!@PHP_BIN@ -Cq
 <?php
 
 require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
diff --git a/utils/country_languages.php b/utils/country_languages.php
index 19ad25b8..b1a7ab11 100755
--- a/utils/country_languages.php
+++ b/utils/country_languages.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php -Cq
+#!@PHP_BIN@ -Cq
 <?php
 
 require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
diff --git a/utils/export.php b/utils/export.php
index 13f062d4..aafb3759 100755
--- a/utils/export.php
+++ b/utils/export.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php -Cq
+#!@PHP_BIN@ -Cq
 <?php
     // Script to extract structured city and street data
     // from a running nominatim instance as CSV data
diff --git a/utils/importWikipedia.php b/utils/importWikipedia.php
index b767adb3..6e429754 100755
--- a/utils/importWikipedia.php
+++ b/utils/importWikipedia.php
@@ -309,7 +309,7 @@ if (isset($aCMDResult['parse-wikipedia'])) {
     $oDB =& getDB();
     $sSQL = 'select page_title from content where page_namespace = 0 and page_id %10 = ';
     $sSQL .= $aCMDResult['parse-wikipedia'];
-    $sSQL .= ' and (page_content ilike \'%{{Coord%\' or (page_content ilike \'%lat%\' and page_content ilike \'%lon%\'))'
+    $sSQL .= ' and (page_content ilike \'%{{Coord%\' or (page_content ilike \'%lat%\' and page_content ilike \'%lon%\'))';
     $aArticleNames = $oDB->getCol($sSQL);
     /* $aArticleNames = $oDB->getCol($sSQL = 'select page_title from content where page_namespace = 0
         and (page_content ilike \'%{{Coord%\' or (page_content ilike \'%lat%\'
diff --git a/utils/imports.php b/utils/imports.php
index 07bc9c45..9d1085f0 100755
--- a/utils/imports.php
+++ b/utils/imports.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php -Cq
+#!@PHP_BIN@ -Cq
 <?php
 
 require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
diff --git a/utils/query.php b/utils/query.php
index 53ce176c..e3e2e7b8 100755
--- a/utils/query.php
+++ b/utils/query.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php -Cq
+#!@PHP_BIN@ -Cq
 <?php
 
 require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
diff --git a/utils/server_compare.php b/utils/server_compare.php
index 39016d07..0a27c484 100755
--- a/utils/server_compare.php
+++ b/utils/server_compare.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php -Cq
+#!@PHP_BIN@ -Cq
 <?php
 
 $sFile = 'sample.log.txt'; // Apache log file
diff --git a/utils/setup.php b/utils/setup.php
index 95eda0f4..d8cceba4 100755
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php -Cq
+#!@PHP_BIN@ -Cq
 <?php
 
 require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
diff --git a/utils/specialphrases.php b/utils/specialphrases.php
index 8378b373..7d22df50 100755
--- a/utils/specialphrases.php
+++ b/utils/specialphrases.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php -Cq
+#!@PHP_BIN@ -Cq
 <?php
 
 require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
diff --git a/utils/update.php b/utils/update.php
index c70bdf54..414fadb5 100755
--- a/utils/update.php
+++ b/utils/update.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php -Cq
+#!@PHP_BIN@ -Cq
 <?php
 
 require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
@@ -99,7 +99,7 @@ if ($aResult['init-updates']) {
         fail('pyosmium-get-changes not found or not usable');
     }
     if (!$aResult['no-update-functions']) {
-        $sSetup = CONST_InstallPath.'/utils/setup.php';
+        $sSetup ='@PHP_BIN@ '. CONST_InstallPath.'/utils/setup.php';
         $iRet = -1;
         passthru($sSetup.' --create-functions --enable-diff-updates', $iRet);
         if ($iRet != 0) {
diff --git a/utils/warm.php b/utils/warm.php
index 0ac13c46..653bcf10 100755
--- a/utils/warm.php
+++ b/utils/warm.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php -Cq
+#!@PHP_BIN@ -Cq
 <?php
 
 require_once(dirname(dirname(__FILE__)).'/settings/settings.php');