delete PHP_BIN from default and add @PHP_BIN@ to passthru function in update.php

diff --git a/settings/defaults.php b/settings/defaults.php
index 8fc5b89efc590b29c0276d0e9911dbc2272465c2..8cdbcb5aa2344688554682dcfc5bb92a97d48cf0 100644 (file)
--- a/settings/defaults.php
+++ b/settings/defaults.php
@@ -47,7 +47,6 @@ if (isset($_GET['debug']) && $_GET['debug']) @define('CONST_Debug', true);
 @define('CONST_ExtraDataPath', CONST_BasePath.'/data');
 @define('CONST_Osm2pgsql_Binary', CONST_InstallPath.'/osm2pgsql/osm2pgsql');
 @define('CONST_Pyosmium_Binary', '@PYOSMIUM_PATH@');
 @define('CONST_ExtraDataPath', CONST_BasePath.'/data');
 @define('CONST_Osm2pgsql_Binary', CONST_InstallPath.'/osm2pgsql/osm2pgsql');
 @define('CONST_Pyosmium_Binary', '@PYOSMIUM_PATH@');

-@define('CONST_PHP_Binary', '@PHP_BIN@');

 @define('CONST_Tiger_Data_Path', CONST_ExtraDataPath.'/tiger');
 @define('CONST_Wikipedia_Data_Path', CONST_ExtraDataPath);
 
 @define('CONST_Tiger_Data_Path', CONST_ExtraDataPath.'/tiger');
 @define('CONST_Wikipedia_Data_Path', CONST_ExtraDataPath);
 

diff --git a/utils/update.php b/utils/update.php
index 46f700621c1857198af78deefe268f7a8a7056d4..b207fd6c025720d1e1a0ed261c60f488be4e7073 100755 (executable)
--- a/utils/update.php
+++ b/utils/update.php
@@ -101,7 +101,7 @@ if ($aResult['init-updates']) {
     if (!$aResult['no-update-functions']) {
         $sSetup = CONST_InstallPath.'/utils/setup.php';
         $iRet = -1;
     if (!$aResult['no-update-functions']) {
         $sSetup = CONST_InstallPath.'/utils/setup.php';
         $iRet = -1;

-        passthru($sSetup.' --create-functions --enable-diff-updates', $iRet);
+        passthru(@PHP_BIN@.' --create-functions --enable-diff-updates', $iRet);

         if ($iRet != 0) {
             fail('Error running setup script');
         }
         if ($iRet != 0) {
             fail('Error running setup script');
         }