Merge remote-tracking branch 'upstream/master'

diff --combined CMakeLists.txt
index bdc5cfdcf51e20885ccc6ce1d3781bda8940b7f9,4fe95f63e03526b385779afcf56acccfbaed3d5c..d4c16126f63680f2ea86ed9735f102d08e1304aa
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -19,7 -19,7 +19,7 @@@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_
  project(nominatim)
  
  set(NOMINATIM_VERSION_MAJOR 4)
- set(NOMINATIM_VERSION_MINOR 1)
+ set(NOMINATIM_VERSION_MINOR 2)
  set(NOMINATIM_VERSION_PATCH 0)
  
  set(NOMINATIM_VERSION "${NOMINATIM_VERSION_MAJOR}.${NOMINATIM_VERSION_MINOR}.${NOMINATIM_VERSION_PATCH}")
@@@ -124,27 -124,6 +124,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
  #-----------------------------------------------------------------------------
@@@ -254,7 -233,14 +254,14 @@@ if (BUILD_IMPORTER
      install(DIRECTORY nominatim
              DESTINATION ${NOMINATIM_LIBDIR}/lib-python
              FILES_MATCHING PATTERN "*.py"
+             PATTERN "paths.py" EXCLUDE
              PATTERN __pycache__ EXCLUDE)
+ 
+     configure_file(${PROJECT_SOURCE_DIR}/cmake/paths-py.tmpl paths-py.installed)
+     install(FILES ${PROJECT_BINARY_DIR}/paths-py.installed
+             DESTINATION ${NOMINATIM_LIBDIR}/lib-python/nominatim
+             RENAME paths.py)
+ 
      install(DIRECTORY lib-sql DESTINATION ${NOMINATIM_LIBDIR})
  
      install(FILES ${COUNTRY_GRID_FILE}