Fix for PEAR installation, for ticket #2020.

This commit is contained in:
paul 2006-11-23 23:16:48 +00:00
parent b645cdf0e6
commit ea21523e13
1 changed files with 3 additions and 11 deletions

View File

@ -81,9 +81,6 @@ TRANS_DIR = ${PHP_DIR}/trans
BUFF_DIR = ${STOR_DIR}/buffer
TEST_RUNNER = ${PHP_DIR}/xmlrpc/testRunner.sh
PEAR_TOOL_DIR = ${BASE_DIR}/../../tools/pear
PEAR_INSTALLER = ${PEAR_TOOL_DIR}/bin/install.sh
DEST_DIR = ${USR_VAR_DIR}/Campcaster/storageServer/var
HOSTNAME = @HOSTNAME@
@ -97,7 +94,7 @@ SCHEDULER_PORT = @SCHEDULER_PORT@
WWW_DOCROOT = @WWW_DOCROOT@
PHP_URL_PREFIX=campcaster
SCHEDULER_URL_PREFIX =
SCHEDULER_URL_PREFIX =
SCHEDULER_XML_RPC_PREFIX = RC2
USR_LIB_DIR_S=$(shell ${ECHO} ${USR_LIB_DIR} | ${SED} -e "s/\//\\\\\\\\\//g")
@ -139,7 +136,7 @@ REPLACE_SED_STRING="s/ls_lib_dir/${USR_LIB_DIR_S}/; \
# Targets
#-------------------------------------------------------------------------------
.PHONY: all dir_setup doc clean docclean depclean distclean dist install
.PHONY: db_init db_clean testonly transtest storage reset pear_setup_devel
.PHONY: db_init db_clean testonly transtest storage reset
.PHONY: copy_files create_database init_database
all:
@ -219,15 +216,10 @@ recheck: clean check
#-------------------------------------------------------------------------------
# Specific targets
#-------------------------------------------------------------------------------
storage: pear_setup_devel dir_setup db_init
storage: dir_setup db_init
storagecheck: storage testonly
pear_setup_devel: pear_install
pear_install:
${PEAR_INSTALLER} -d ${USR_DIR}
dir_setup: ${DOXYGEN_DIR}
bin/setupDirs.sh ${STOR_DIR} ${ACCESS_DIR} ${TRANS_DIR} ${BUFF_DIR}