Merge remote-tracking branch 'upstream/master'

diff --combined CMakeLists.txt
index 2acd4d3a7b353e54aa5d7eaf5521e59e4b4858b5,63081fdf06b9b4c1a40eb52df807362a891d95fc..8d8739ddc84446e099cdd955b846e6ab98961efa
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -114,27 -114,6 +114,27 @@@ if (BUILD_IMPORTER
  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
  #-----------------------------------------------------------------------------
  
@@@ -281,4 -260,5 +281,5 @@@ install(FILES settings/env.default
                settings/import-extratags.style
                settings/icu_tokenizer.yaml
                settings/icu-rules/extended-unicode-to-asccii.yaml
+               settings/country_settings.yaml
          DESTINATION ${NOMINATIM_CONFIGDIR})