hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-03-11 13:24:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
ThomasBarris
2018-08-23 09:24:51 +02:00
parent e936041713
commit 6577be3744
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
settings/defaults.php
View File

@@ -47,7 +47,6 @@ if (isset($_GET['debug']) && $_GET['debug']) @define('CONST_Debug', true);
@define('CONST_ExtraDataPath', CONST_BasePath.'/data'); @define('CONST_ExtraDataPath', CONST_BasePath.'/data');
@define('CONST_Osm2pgsql_Binary', CONST_InstallPath.'/osm2pgsql/osm2pgsql'); @define('CONST_Osm2pgsql_Binary', CONST_InstallPath.'/osm2pgsql/osm2pgsql');
@define('CONST_Pyosmium_Binary', '@PYOSMIUM_PATH@'); @define('CONST_Pyosmium_Binary', '@PYOSMIUM_PATH@');
@define('CONST_PHP_Binary', '@PHP_BIN@');
@define('CONST_Tiger_Data_Path', CONST_ExtraDataPath.'/tiger'); @define('CONST_Tiger_Data_Path', CONST_ExtraDataPath.'/tiger');
@define('CONST_Wikipedia_Data_Path', CONST_ExtraDataPath); @define('CONST_Wikipedia_Data_Path', CONST_ExtraDataPath);

2
utils/update.php
View File

@@ -101,7 +101,7 @@ if ($aResult['init-updates']) {
if (!$aResult['no-update-functions']) { if (!$aResult['no-update-functions']) {
$sSetup = CONST_InstallPath.'/utils/setup.php'; $sSetup = CONST_InstallPath.'/utils/setup.php';
$iRet = -1; $iRet = -1;
passthru($sSetup.' --create-functions --enable-diff-updates', $iRet); passthru(@PHP_BIN@.' --create-functions --enable-diff-updates', $iRet);
if ($iRet != 0) { if ($iRet != 0) {
fail('Error running setup script'); fail('Error running setup script');
} }