Merge remote-tracking branch 'upstream/master'

diff --combined CMakeLists.txt
index 347f4d488b5a9c506985aab71a1be9feebfe02b2,a7c7b3951463441c95adf6ddb9a44c67a4c8c6b8..0c6d4094ed7eaadd78d42b7898e33793d7e72450
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -19,7 -19,7 +19,7 @@@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_
  project(nominatim)
  
  set(NOMINATIM_VERSION_MAJOR 3)
- set(NOMINATIM_VERSION_MINOR 1)
+ set(NOMINATIM_VERSION_MINOR 2)
  set(NOMINATIM_VERSION_PATCH 0)
  
  set(NOMINATIM_VERSION "${NOMINATIM_VERSION_MAJOR}.${NOMINATIM_VERSION_MINOR}.${NOMINATIM_VERSION_PATCH}")
@@@ -77,6 -77,16 +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 with -DPHP_BIN=/path/php ")
+ endif()
+ message (STATUS "Using PHP binary " ${PHP_BIN})
+ 
  #-----------------------------------------------------------------------------
  #
  # Setup settings and paths
@@@ -93,14 -103,6 +103,14 @@@ set(CUSTOMFILE
      website/reverse.php
      website/search.php
      website/status.php
 +    website/403.html
 +    website/509.html
 +    website/crossdomain.xml
 +    website/favicon.ico
 +    website/last_update.php
 +    website/nominatim.xml
 +    website/robots.txt
 +    website/taginfo.json
      utils/blocks.php
      utils/country_languages.php
      utils/imports.php

diff --combined utils/update.php
index 4897872b5fee5998dbc64ba1e1229e76c11e1025,414fadb5afa51a68e63c3a486c77ad8f7428f876..ad57101009f9dd7e996a2eeb536817c754b738c9
--- 1/utils/update.php
--- 2/utils/update.php
+++ b/utils/update.php
@@@ -1,4 -1,4 +1,4 @@@
- #!/usr/bin/php -Cq
+ #!@PHP_BIN@ -Cq
  <?php
  
  require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
@@@ -43,7 -43,6 +43,7 @@@ $aCMDOption
  getCmdOpt($_SERVER['argv'], $aCMDOptions, $aResult, true, true);
  
  if (!isset($aResult['index-instances'])) $aResult['index-instances'] = 1;
 +
  if (!isset($aResult['index-rank'])) $aResult['index-rank'] = 0;
  
  date_default_timezone_set('Etc/UTC');
@@@ -100,7 -99,7 +100,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) {