From: Sarah Hoffmann <lonvia@denofr.de>
Date: Fri, 3 Jan 2020 09:08:00 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~259
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/2419066aabea73f78c4f21420b26bc0c633998e7?hp=-c

Merge remote-tracking branch 'upstream/master'
---

2419066aabea73f78c4f21420b26bc0c633998e7
diff --combined CMakeLists.txt
index fcc7075a,d0b72a48..a5034786
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -107,19 -107,9 +107,19 @@@ set(WEBSITESCRIPT
      website/status.php
  )
  
 +set(WEBSITEFILES
 +    403.html
 +    509.html
 +    crossdomain.xml
 +    favicon.ico
 +    nominatim.xml
 +    robots.txt
 +    taginfo.json
 +)
 +
  set(CUSTOMSCRIPTS
+     utils/check_import_finished.php
      utils/country_languages.php
-     utils/importWikipedia.php
      utils/export.php
      utils/query.php
      utils/setup.php
@@@ -138,11 -128,6 +138,11 @@@ foreach (script_source ${WEBSITESCRIPTS
                     ${PROJECT_BINARY_DIR}/${script_source})
  endforeach()
  
 +foreach (webfile ${WEBSITEFILES})
 +    configure_file(${PROJECT_SOURCE_DIR}/website/${webfile}
 +                   ${PROJECT_BINARY_DIR}/website/${webfile})
 +endforeach()
 +
  configure_file(${PROJECT_SOURCE_DIR}/settings/defaults.php
                 ${PROJECT_BINARY_DIR}/settings/settings.php)