From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 28 Oct 2019 21:19:44 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~274
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/00aed47c6f40c12d108df4412d807f84c0bd7097?hp=-c

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

00aed47c6f40c12d108df4412d807f84c0bd7097
diff --combined CMakeLists.txt
index 3cb56ed8,88b04051..fcc7075a
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -19,7 -19,7 +19,7 @@@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_
  project(nominatim)
  
  set(NOMINATIM_VERSION_MAJOR 3)
- set(NOMINATIM_VERSION_MINOR 3)
+ set(NOMINATIM_VERSION_MINOR 4)
  set(NOMINATIM_VERSION_PATCH 0)
  
  set(NOMINATIM_VERSION "${NOMINATIM_VERSION_MAJOR}.${NOMINATIM_VERSION_MINOR}.${NOMINATIM_VERSION_PATCH}")
@@@ -107,16 -107,6 +107,16 @@@ set(WEBSITESCRIPT
      website/status.php
  )
  
 +set(WEBSITEFILES
 +    403.html
 +    509.html
 +    crossdomain.xml
 +    favicon.ico
 +    nominatim.xml
 +    robots.txt
 +    taginfo.json
 +)
 +
  set(CUSTOMSCRIPTS
      utils/country_languages.php
      utils/importWikipedia.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)