Merge remote-tracking branch 'upstream/master'

diff --combined CMakeLists.txt
index 3fad37d7a97563b038feb4df7179ca81ecea8746,1c2745946bcb133a85cf5a95ca24b06a4cd9e36e..4915d7649d4f7b50e23d9c5bb536999b2777bbcf
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -98,7 -98,6 +98,6 @@@ if (BUILD_IMPORTER
     set(CUSTOMSCRIPTS
         check_import_finished.php
         country_languages.php
-        importWikipedia.php
         export.php
         query.php
         setup.php
@@@ -111,6 -110,9 +110,9 @@@
         configure_file(${PROJECT_SOURCE_DIR}/cmake/script.tmpl
                        ${PROJECT_BINARY_DIR}/utils/${script_source})
     endforeach()
+ 
+    configure_file(${PROJECT_SOURCE_DIR}/cmake/tool.tmpl
+                   ${PROJECT_BINARY_DIR}/nominatim)
  endif()
  
  #-----------------------------------------------------------------------------
@@@ -118,21 -120,6 +120,21 @@@
  #-----------------------------------------------------------------------------
  
  if (BUILD_API)
 +   set(WEBSITEFILES
 +       403.html
 +       509.html
 +       crossdomain.xml
 +       favicon.ico
 +       nominatim.xml
 +       robots.txt
 +       taginfo.json
 +   )
 +
 +   foreach (webfile ${WEBSITEFILES})
 +       configure_file(${PROJECT_SOURCE_DIR}/website/${webfile}
 +                      ${PROJECT_BINARY_DIR}/website/${webfile})
 +   endforeach()
 +
     add_custom_target(serve
             php -S 127.0.0.1:8088
             WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/website

diff --combined lib/admin/update.php
index 5bc2d73ddd6f051dadc409af7befa0064b30a5a9,50f611d71aa9ab7c9294cc649f7394eb030703ff..03fcdcafb0c93e623e80f5a0bdc8da491ff48187
--- 1/utils/update.php
--- 2/lib/admin/update.php
+++ b/lib/admin/update.php
@@@ -1,4 -1,5 +1,5 @@@
  <?php
+ @define('CONST_LibDir', dirname(dirname(__FILE__)));
  
  require_once(CONST_LibDir.'/init-cmd.php');
  require_once(CONST_LibDir.'/setup_functions.php');
@@@ -52,7 -53,6 +53,7 @@@ loadSettings($aCMDResult['project-dir'
  setupHTTPProxy();
  
  if (!isset($aResult['index-instances'])) $aResult['index-instances'] = 1;
 +
  if (!isset($aResult['index-rank'])) $aResult['index-rank'] = 0;
  
  date_default_timezone_set('Etc/UTC');