From 56839ba50fb28285d7e6e647cb04df0dece1a387 Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 2 Dec 2018 11:50:44 +0100
Subject: [PATCH] No longer install phrase configuration

Instead add it as a configurable path with the one from
the source directory as the default.

Also reinstates that settings/defaults.php is installed as
settings/settings.php.
---
 CMakeLists.txt              | 10 ++--------
 settings/defaults.php       |  1 +
 utils/country_languages.php |  2 +-
 utils/specialphrases.php    |  2 +-
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 19c560f7..7d401ade 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -125,14 +125,8 @@ foreach (script_source ${WEBSITESCRIPTS})
                    ${PROJECT_BINARY_DIR}/${script_source})
 endforeach()
 
-set(CONFIGUREFILES
-    settings/phrase_settings.php
-    settings/defaults.php
-   )
-
-foreach (cfile ${CONFIGUREFILES})
-    configure_file(${PROJECT_SOURCE_DIR}/${cfile} ${PROJECT_BINARY_DIR}/${cfile})
-endforeach()
+configure_file(${PROJECT_SOURCE_DIR}/settings/defaults.php
+               ${PROJECT_BINARY_DIR}/settings/settings.php)
 
 set(WEBPATHS css images js)
 
diff --git a/settings/defaults.php b/settings/defaults.php
index 297e6ecd..2b3ddeb2 100644
--- a/settings/defaults.php
+++ b/settings/defaults.php
@@ -49,6 +49,7 @@ if (isset($_GET['debug']) && $_GET['debug']) @define('CONST_Debug', true);
 @define('CONST_Pyosmium_Binary', '@PYOSMIUM_PATH@');
 @define('CONST_Tiger_Data_Path', CONST_ExtraDataPath.'/tiger');
 @define('CONST_Wikipedia_Data_Path', CONST_ExtraDataPath);
+@define('CONST_Phrase_Config', CONST_BasePath.'/settings/phrase_settings.php');
 @define('CONST_Address_Level_Config', CONST_BasePath.'/settings/address-levels.json');
 
 // osm2pgsql settings
diff --git a/utils/country_languages.php b/utils/country_languages.php
index 07a94225..63f6525c 100644
--- a/utils/country_languages.php
+++ b/utils/country_languages.php
@@ -14,7 +14,7 @@ $aCMDOptions
    );
 getCmdOpt($_SERVER['argv'], $aCMDOptions, $aCMDResult, true, true);
 
-include(CONST_InstallPath.'/settings/phrase_settings.php');
+include(CONST_Phrase_Config);
 
 if (true) {
     $sURL = 'https://wiki.openstreetmap.org/wiki/Special:Export/Nominatim/Country_Codes';
diff --git a/utils/specialphrases.php b/utils/specialphrases.php
index 40fd3750..cb237be6 100644
--- a/utils/specialphrases.php
+++ b/utils/specialphrases.php
@@ -14,7 +14,7 @@ $aCMDOptions
   );
 getCmdOpt($_SERVER['argv'], $aCMDOptions, $aCMDResult, true, true);
 
-include(CONST_InstallPath.'/settings/phrase_settings.php');
+include(CONST_Phrase_Config);
 
 if ($aCMDResult['wiki-import']) {
     $oNormalizer = Transliterator::createFromRules(CONST_Term_Normalization_Rules);
-- 
2.39.5