More consistency to pear setup added (related to #1424).

This commit is contained in:
tomash 2005-09-30 23:28:26 +00:00
parent e266488d8f
commit 53258d2223
3 changed files with 3 additions and 4 deletions

View file

@ -82,7 +82,7 @@ $config = array(
'bufferDir' => dirname(__FILE__).'/../../archiveServer/var/stor/buffer', 'bufferDir' => dirname(__FILE__).'/../../archiveServer/var/stor/buffer',
'transDir' => dirname(__FILE__).'/../../archiveServer/var/trans', 'transDir' => dirname(__FILE__).'/../../archiveServer/var/trans',
'accessDir' => dirname(__FILE__).'/../../archiveServer/var/access', 'accessDir' => dirname(__FILE__).'/../../archiveServer/var/access',
'pearPath' => dirname(__FILE__).'/../../../usr/lib/php/php', 'pearPath' => dirname(__FILE__).'/../../../usr/lib/pear',
'isArchive' => TRUE, 'isArchive' => TRUE,
'validate' => TRUE, 'validate' => TRUE,
'useTrash' => FALSE, 'useTrash' => FALSE,

View file

@ -222,8 +222,7 @@ storage: pear_setup_devel dir_setup db_init
storagecheck: storage testonly storagecheck: storage testonly
pear_setup_devel: pear_setup_devel: pear_install
${PEAR_INSTALLER} -d ${PEAR_TOOL_DIR}/tmp
pear_install: pear_install:
${PEAR_INSTALLER} -d ${USR_DIR} ${PEAR_INSTALLER} -d ${USR_DIR}

View file

@ -88,7 +88,7 @@ $config = array(
'bufferDir' => dirname(__FILE__).'/../../storageServer/var/stor/buffer', 'bufferDir' => dirname(__FILE__).'/../../storageServer/var/stor/buffer',
'transDir' => dirname(__FILE__).'/../../storageServer/var/trans', 'transDir' => dirname(__FILE__).'/../../storageServer/var/trans',
'accessDir' => dirname(__FILE__).'/../../storageServer/var/access', 'accessDir' => dirname(__FILE__).'/../../storageServer/var/access',
'pearPath' => dirname(__FILE__).'/../../../tools/pear/tmp/lib/pear', 'pearPath' => dirname(__FILE__).'/../../../usr/lib/pear',
'isArchive' => FALSE, 'isArchive' => FALSE,
'validate' => TRUE, 'validate' => TRUE,
'useTrash' => TRUE, 'useTrash' => TRUE,