mirror of
https://github.com/osm-search/Nominatim.git
synced 2024-12-24 13:31:37 +03:00
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.
This commit is contained in:
parent
fe6a2e9f14
commit
56839ba50f
@ -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)
|
||||
|
||||
|
@ -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
|
||||
|
@ -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';
|
||||
|
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user