Merge remote-tracking branch 'upstream/master'

diff --combined CMakeLists.txt
index 33b6ae649b4a507abf1cf9aea4cd3466e1f3817b,fa92dd027617345738347b9703cdadbd34fe39a7..a2a9845504c5c462555bddeb3c8a0adc78d7ce92
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -109,46 -109,10 +109,31 @@@ if (BUILD_IMPORTER
                             "    wget -O ${PROJECT_SOURCE_DIR}/data/country_osm_grid.sql.gz https://www.nominatim.org/data/country_grid.sql.gz")
     endif()
  
-    set(CUSTOMSCRIPTS
-        check_import_finished.php
-        country_languages.php
-        export.php
-        query.php
-        setup.php
-        update.php
-        warm.php
-       )
- 
-    foreach (script_source ${CUSTOMSCRIPTS})
-        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()
  
 +#-----------------------------------------------------------------------------
 +# 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
  #-----------------------------------------------------------------------------