remove base country grid from repo

[nominatim.git] / settings / defaults.php

diff --git a/settings/defaults.php b/settings/defaults.php
index a953e460f1d81a7651cedd606d5d238e3613822c..a35c3cc8d5036c26ee9d0dd43725de8abd051b96 100644 (file)
--- a/settings/defaults.php
+++ b/settings/defaults.php
@@ -39,9 +39,11 @@ if (isset($_GET['debug']) && $_GET['debug']) @define('CONST_Debug', true);
 @define('CONST_HTTP_Proxy_Password', '');
 
 // Paths
+@define('CONST_ExtraDataPath', CONST_BasePath.'/data');
 @define('CONST_Osm2pgsql_Binary', CONST_InstallPath.'/osm2pgsql/osm2pgsql');
-@define('CONST_Osmosis_Binary', '/usr/bin/osmosis');
-@define('CONST_Tiger_Data_Path', CONST_BasePath.'/data/tiger');
+@define('CONST_Osmosis_Binary', '@OSMOSIS_PATH@');
+@define('CONST_Tiger_Data_Path', CONST_ExtraDataPath.'/tiger');
+@define('CONST_Wikipedia_Data_Path', CONST_ExtraDataPath);
 
 // osm2pgsql settings
 @define('CONST_Osm2pgsql_Flatnode_File', null);