Merge pull request #2702 from lonvia/move-country-names-into-includes

Clean up country name settings

diff --combined CMakeLists.txt
index 52bb9a01d906aa518f3e0e283a11589c3016f5e2,782c0cdb1b3bcd404be0216edcb2320e3112646b..af7dbc2a43de5f0577502b299a5d816bc981db03
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -26,17 -26,6 +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
@@@ -276,6 -265,8 +276,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