From 53258d22233b72dd40bc98b0d4d7d70da24420fb Mon Sep 17 00:00:00 2001 From: tomash Date: Fri, 30 Sep 2005 23:28:26 +0000 Subject: [PATCH] More consistency to pear setup added (related to #1424). --- livesupport/modules/archiveServer/var/conf.php | 2 +- livesupport/modules/storageServer/etc/Makefile.in | 3 +-- livesupport/modules/storageServer/var/conf.php | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/livesupport/modules/archiveServer/var/conf.php b/livesupport/modules/archiveServer/var/conf.php index bca503c2e..2657a0095 100644 --- a/livesupport/modules/archiveServer/var/conf.php +++ b/livesupport/modules/archiveServer/var/conf.php @@ -82,7 +82,7 @@ $config = array( 'bufferDir' => dirname(__FILE__).'/../../archiveServer/var/stor/buffer', 'transDir' => dirname(__FILE__).'/../../archiveServer/var/trans', 'accessDir' => dirname(__FILE__).'/../../archiveServer/var/access', - 'pearPath' => dirname(__FILE__).'/../../../usr/lib/php/php', + 'pearPath' => dirname(__FILE__).'/../../../usr/lib/pear', 'isArchive' => TRUE, 'validate' => TRUE, 'useTrash' => FALSE, diff --git a/livesupport/modules/storageServer/etc/Makefile.in b/livesupport/modules/storageServer/etc/Makefile.in index 8e94c29b8..8e27f1d7f 100644 --- a/livesupport/modules/storageServer/etc/Makefile.in +++ b/livesupport/modules/storageServer/etc/Makefile.in @@ -222,8 +222,7 @@ storage: pear_setup_devel dir_setup db_init storagecheck: storage testonly -pear_setup_devel: - ${PEAR_INSTALLER} -d ${PEAR_TOOL_DIR}/tmp +pear_setup_devel: pear_install pear_install: ${PEAR_INSTALLER} -d ${USR_DIR} diff --git a/livesupport/modules/storageServer/var/conf.php b/livesupport/modules/storageServer/var/conf.php index d8354b3e0..f0e457b90 100644 --- a/livesupport/modules/storageServer/var/conf.php +++ b/livesupport/modules/storageServer/var/conf.php @@ -88,7 +88,7 @@ $config = array( 'bufferDir' => dirname(__FILE__).'/../../storageServer/var/stor/buffer', 'transDir' => dirname(__FILE__).'/../../storageServer/var/trans', 'accessDir' => dirname(__FILE__).'/../../storageServer/var/access', - 'pearPath' => dirname(__FILE__).'/../../../tools/pear/tmp/lib/pear', + 'pearPath' => dirname(__FILE__).'/../../../usr/lib/pear', 'isArchive' => FALSE, 'validate' => TRUE, 'useTrash' => TRUE,