Merge remote-tracking branch 'upstream/master'

diff --combined CMakeLists.txt
index 83e3440338d5fdd2a91385bf381bee9d13587a13,d1c2702a06954154ef4c4c3469a24766cead1f46..4b4e3fc9d139b4f714afe8d315c7e233b385dc5e
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -113,27 -113,6 +113,27 @@@ if (BUILD_IMPORTER
                    ${PROJECT_BINARY_DIR}/nominatim)
  endif()
  
 +#-----------------------------------------------------------------------------
 +# Targets for running a development webserver from the build directory.
 +#-----------------------------------------------------------------------------
 +
 +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()
 +endif()
 +
  #-----------------------------------------------------------------------------
  # Tests
  #-----------------------------------------------------------------------------
@@@ -292,3 -271,7 +292,7 @@@ if (INSTALL_MUNIN_PLUGINS
                    munin/nominatim_requests
              DESTINATION ${NOMINATIM_MUNINDIR})
  endif()
+ 
+ message(WARNING "Building with CMake is deprecated and will be removed in Nominatim 5.0."
+                 "Use Nominatim pip packages instead.\n"
+                 "See https://nominatim.org/release-docs/develop/admin/Installation/#downloading-and-building-nominatim")