From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 23 Sep 2012 19:44:03 +0000 (+0200)
Subject: switch to distribution-supplied osmosis
X-Git-Tag: v2.0.0~21
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/b61259bf7725b39947b8a841f40554d5a8b1e8c7

switch to distribution-supplied osmosis

Both, Debian and Ubuntu now come with a reasonably recent version
of osmosis. Make using that the default.
---

diff --git a/settings/settings.php b/settings/settings.php
index 4ebc199d..d90136bd 100644
--- a/settings/settings.php
+++ b/settings/settings.php
@@ -11,7 +11,7 @@
 	@define('CONST_Path_Postgresql_Contrib', '/usr/share/postgresql/'.CONST_Postgresql_Version.'/contrib');
 	@define('CONST_Path_Postgresql_Postgis', CONST_Path_Postgresql_Contrib.'/postgis-1.5');
 	@define('CONST_Osm2pgsql_Binary', CONST_BasePath.'/osm2pgsql/osm2pgsql');
-	@define('CONST_Osmosis_Binary', CONST_BasePath.'/osmosis-0.40.1/bin/osmosis');
+	@define('CONST_Osmosis_Binary', '/usr/bin/osmosis');
 
 	// Website settings
 	@define('CONST_ClosedForIndexing', false);