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.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 19c560f769cc7055e2eb472a0a958ab08f92193c..7d401ade35a5427ad38a06adc98dc0d75c46a17b 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -125,14 +125,8 @@ foreach (script_source ${WEBSITESCRIPTS})
                    ${PROJECT_BINARY_DIR}/${script_source})
 endforeach()
 
                    ${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)
 
 
 set(WEBPATHS css images js)
 

diff --git a/settings/defaults.php b/settings/defaults.php
index 297e6ecdb2f79f31d52c9a53c7e388dff6eb8f81..2b3ddeb28ada84987632c743d506efb557dba1cc 100644 (file)
--- 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_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
 @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 07a942257e77dec2a7f3dc02b690554b8dddf3e8..63f6525c0b6bf6ba12e7f4177f57b8449c27d577 100644 (file)
--- a/utils/country_languages.php
+++ b/utils/country_languages.php
@@ -14,7 +14,7 @@ $aCMDOptions
    );
 getCmdOpt($_SERVER['argv'], $aCMDOptions, $aCMDResult, true, true);
 
    );
 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';
 
 if (true) {
     $sURL = 'https://wiki.openstreetmap.org/wiki/Special:Export/Nominatim/Country_Codes';

diff --git a/utils/specialphrases.php b/utils/specialphrases.php
index 40fd37500978c3cfe9d6291670fa4ca8e138c15d..cb237be6d74cd7478e1842c37bdc327ecfe50997 100644 (file)
--- a/utils/specialphrases.php
+++ b/utils/specialphrases.php
@@ -14,7 +14,7 @@ $aCMDOptions
   );
 getCmdOpt($_SERVER['argv'], $aCMDOptions, $aCMDResult, true, true);
 
   );
 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);
 
 if ($aCMDResult['wiki-import']) {
     $oNormalizer = Transliterator::createFromRules(CONST_Term_Normalization_Rules);