From: Sarah Hoffmann <lonvia@denofr.de>
Date: Fri, 3 Sep 2021 12:16:46 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~156
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/754846d9dc125e3caa8a97b8381918b565a55289?ds=inline;hp=-c

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

754846d9dc125e3caa8a97b8381918b565a55289
diff --combined CMakeLists.txt
index 2acd4d3a,63081fdf..8d8739dd
--- a/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})