From: Sarah Hoffmann <lonvia@denofr.de>
Date: Tue, 18 May 2021 09:31:18 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~167
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/f5e56d1ef1e2631c67cc95bd124403410248fbdd?ds=inline;hp=-c

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

f5e56d1ef1e2631c67cc95bd124403410248fbdd
diff --combined CMakeLists.txt
index a2a98455,e2001d15..b8a6a2e4
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -113,27 -113,6 +113,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
  #-----------------------------------------------------------------------------
@@@ -279,4 -258,5 +279,5 @@@ install(FILES settings/env.default
                settings/import-address.style
                settings/import-full.style
                settings/import-extratags.style
+               settings/legacy_icu_tokenizer.json
          DESTINATION ${NOMINATIM_CONFIGDIR})