Merge remote-tracking branch 'upstream/master'

diff --combined CMakeLists.txt
index 5a5b1c08e424eb77d3e9b46ce24b4e0f7a9790d0,8360d549d24ff707ea9d3cb8aa2d650c55ca7fad..67746f78f2e83e289462eb225e775695e04ca987
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -26,6 -26,17 +26,17 @@@ set(NOMINATIM_VERSION "${NOMINATIM_VERS
  
  add_definitions(-DNOMINATIM_VERSION="${NOMINATIM_VERSION}")
  
+ # Setting GIT_HASH
+ find_package(Git)
+ if (GIT_FOUND)
+     execute_process(
+         COMMAND "${GIT_EXECUTABLE}" log -1 --format=%h
+         WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
+         OUTPUT_VARIABLE GIT_HASH
+         OUTPUT_STRIP_TRAILING_WHITESPACE
+         ERROR_QUIET
+         )
+ endif()
  
  #-----------------------------------------------------------------------------
  #  Configuration
@@@ -33,7 -44,7 +44,7 @@@
  
  set(BUILD_IMPORTER on CACHE BOOL "Build everything for importing/updating the database")
  set(BUILD_API on CACHE BOOL "Build everything for the API server")
- set(BUILD_MODULE on CACHE BOOL "Build PostgreSQL module")
+ set(BUILD_MODULE off CACHE BOOL "Build PostgreSQL module for legacy tokenizer")
  set(BUILD_TESTS on CACHE BOOL "Build test suite")
  set(BUILD_DOCS on CACHE BOOL "Build documentation")
  set(BUILD_MANPAGE on CACHE BOOL "Build Manual Page")
@@@ -114,27 -125,6 +125,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
  #-----------------------------------------------------------------------------
@@@ -286,6 -276,8 +297,8 @@@ install(FILES settings/env.default
  
  install(DIRECTORY settings/icu-rules
          DESTINATION ${NOMINATIM_CONFIGDIR})
+ install(DIRECTORY settings/country-names
+         DESTINATION ${NOMINATIM_CONFIGDIR})
  
  if (INSTALL_MUNIN_PLUGINS)
      install(FILES munin/nominatim_importlag