Merge remote-tracking branch 'upstream/master'

diff --cc CMakeLists.txt
index 037ae2be5f0e8868d74bab69e23a56c561413d0a,f7d396d0ebc6be503d653085268e3e152cd2d08f..45b205fdffdb9a936ff24be645b66a6758a6cd2d
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -117,37 -117,6 +117,27 @@@ if (BUILD_IMPORTER
                    ${PROJECT_BINARY_DIR}/nominatim)
  endif()
  
- 
-    add_custom_target(serve
-            php -S 127.0.0.1:8088
-            WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/website
-    )
- 
-    add_custom_target(serve-global
-            php -S 0.0.0.0:8088
-            WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/website
-    )
 +#-----------------------------------------------------------------------------
 +# 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
  #-----------------------------------------------------------------------------