Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib / setup_functions.php

diff --git a/lib/setup_functions.php b/lib/setup_functions.php
index a2287d9bf794fc19bfa5a9140324ec581896f24b..dc84cf92852df0a98765cad45f2adfd39d261571 100755 (executable)
--- a/lib/setup_functions.php
+++ b/lib/setup_functions.php
@@ -18,11 +18,8 @@ function checkInFile($sOSMFile)
 function getOsm2pgsqlBinary()
 {
     $sBinary = getSetting('OSM2PGSQL_BINARY');
-    if (!$sBinary) {
-        $sBinary = CONST_InstallDir.'/osm2pgsql/osm2pgsql';
-    }
 
-    return $sBinary;
+    return $sBinary ? $sBinary : CONST_Default_Osm2pgsql;
 }
 
 function getImportStyle()