Merge remote-tracking branch 'upstream/master'

diff --cc CMakeLists.txt
index 816ce647613c4a996a6ee6c7ed980607f6b584fc,b4f4ddb8107e82d44a3ee897d54a61e347ac385d..3fad37d7a97563b038feb4df7179ca81ecea8746
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -118,44 -118,6 +118,21 @@@ endif(
  #-----------------------------------------------------------------------------
  
  if (BUILD_API)
-    set(WEBSITESCRIPTS
-        website/deletable.php
-        website/details.php
-        website/lookup.php
-        website/polygons.php
-        website/reverse.php
-        website/search.php
-        website/status.php
-    )
- 
 +   set(WEBSITEFILES
 +       403.html
 +       509.html
 +       crossdomain.xml
 +       favicon.ico
 +       nominatim.xml
 +       robots.txt
 +       taginfo.json
 +   )
 +
-    foreach (script_source ${WEBSITESCRIPTS})
-        configure_file(${PROJECT_SOURCE_DIR}/cmake/website.tmpl
-                       ${PROJECT_BINARY_DIR}/${script_source})
-    endforeach()
- 
-    set(WEBPATHS css images js)
- 
 +   foreach (webfile ${WEBSITEFILES})
 +       configure_file(${PROJECT_SOURCE_DIR}/website/${webfile}
 +                      ${PROJECT_BINARY_DIR}/website/${webfile})
 +   endforeach()
 +
-    foreach (wp ${WEBPATHS})
-        execute_process(
-            COMMAND ln -sf ${PROJECT_SOURCE_DIR}/website/${wp} ${PROJECT_BINARY_DIR}/website/
-        )
-    endforeach()
- 
     add_custom_target(serve
             php -S 127.0.0.1:8088
             WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/website

diff --cc sql/functions/address_lookup.sql
Simple merge

diff --cc utils/update.php
index 6e6a99abbdee1e566b5494622c850e8824032a23,931ca179819cd9b8577062dca3ac9785069c0c67..5bc2d73ddd6f051dadc409af7befa0064b30a5a9
--- 1/utils/update.php
--- 2/utils/update.php
+++ b/utils/update.php
@@@ -46,8 -48,10 +48,11 @@@ $aCMDOption
  
  getCmdOpt($_SERVER['argv'], $aCMDOptions, $aResult, true, true);
  
+ loadSettings($aCMDResult['project-dir'] ?? getcwd());
+ 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');