From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 29 Mar 2021 10:10:25 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~174
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/0ee821d64f7fe700e593583f74141e1edafaacc6?hp=-c

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

0ee821d64f7fe700e593583f74141e1edafaacc6
diff --combined CMakeLists.txt
index fdc67ffe,1c6336a4..40140056
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -114,7 -114,6 +114,6 @@@ if (BUILD_IMPORTER
         export.php
         query.php
         setup.php
-        specialphrases.php
         update.php
         warm.php
        )
@@@ -128,27 -127,6 +127,27 @@@
                    ${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
  #-----------------------------------------------------------------------------
@@@ -280,7 -258,7 +279,7 @@@ endif(
  
  install(FILES settings/env.defaults
                settings/address-levels.json
-               settings/phrase_settings.php
+               settings/phrase-settings.json
                settings/import-admin.style
                settings/import-street.style
                settings/import-address.style