Merge remote-tracking branch 'upstream/master'

diff --combined CMakeLists.txt
index 3f68012f08715b6a6261a034e22f6befd295ed0d,8868ea32e31ef2db8f2e3482f17c99b56ddd6109..cf76f00ce10d80b586513512d783fb4799ea7c4d
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -92,16 -92,6 +92,6 @@@ if (BUILD_API OR BUILD_IMPORTER
      else()
          message (STATUS "Using PHP binary " ${PHP_BIN})
      endif()
-     if (NOT PHPCGI_BIN)
-         find_program (PHPCGI_BIN php-cgi)
-     endif()
-     # sanity check if PHP binary exists
-     if (NOT EXISTS ${PHPCGI_BIN})
-         message(WARNING "php-cgi binary not found. nominatim tool will not provide query functions.")
-         set (PHPCGI_BIN "")
-     else()
-         message (STATUS "Using php-cgi binary " ${PHPCGI_BIN})
-     endif()
  endif()
  
  #-----------------------------------------------------------------------------
@@@ -124,27 -114,6 +114,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
  #-----------------------------------------------------------------------------