From 1e0f91befc6537af5727490f7388e7bd53975fb7 Mon Sep 17 00:00:00 2001 From: sebastian Date: Fri, 21 Nov 2008 13:40:28 +0000 Subject: [PATCH] #2328 install fails under ubuntu hardy (caused by pgsql connection) --- campcaster/src/modules/archiveServer/etc/Makefile.in | 4 ++-- campcaster/src/modules/storageServer/etc/Makefile.in | 6 +++--- campcaster/src/products/scheduler/etc/Makefile.in | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/campcaster/src/modules/archiveServer/etc/Makefile.in b/campcaster/src/modules/archiveServer/etc/Makefile.in index f8d7b5245..755693066 100644 --- a/campcaster/src/modules/archiveServer/etc/Makefile.in +++ b/campcaster/src/modules/archiveServer/etc/Makefile.in @@ -181,10 +181,10 @@ dir_setup: ${DOXYGEN_DIR} bin/setupDirs.sh ${STOR_DIR} ${ACCESS_DIR} ${TRANS_DIR} ${BUFF_DIR} db_init: - cd var/install && php -q install.php + -cd var/install && php -q install.php db_clean: - cd var/install && php -q uninstall.php + -cd var/install && php -q uninstall.php ${TMP_DIR}: ${MKDIR} ${TMP_DIR} diff --git a/campcaster/src/modules/storageServer/etc/Makefile.in b/campcaster/src/modules/storageServer/etc/Makefile.in index 5a00ba615..931f5bdb1 100644 --- a/campcaster/src/modules/storageServer/etc/Makefile.in +++ b/campcaster/src/modules/storageServer/etc/Makefile.in @@ -216,7 +216,7 @@ endif init_database: ifeq (@INIT_LS_DATABASE@,yes) - cd ${DEST_VAR_DIR}/install && ${PHP} -q install.php + -cd ${DEST_VAR_DIR}/install && ${PHP} -q install.php endif @@ -234,12 +234,12 @@ dir_setup: bin/setupDirs.sh ${STOR_DIR} ${ACCESS_DIR} ${TRANS_DIR} ${BUFF_DIR} db_init: - cd var/install && php -q install.php + -cd var/install && php -q install.php chgrp ${APACHE_GROUP} ${STOR_DIR} ${ACCESS_DIR} ${TRANS_DIR} ${BUFF_DIR} chmod g+sw ${STOR_DIR} ${ACCESS_DIR} ${TRANS_DIR} ${BUFF_DIR} db_clean: - cd var/install && php -q uninstall.php + -cd var/install && php -q uninstall.php reset: ./bin/resetStorage.sh diff --git a/campcaster/src/products/scheduler/etc/Makefile.in b/campcaster/src/products/scheduler/etc/Makefile.in index 6e771a74c..00c19a76b 100644 --- a/campcaster/src/products/scheduler/etc/Makefile.in +++ b/campcaster/src/products/scheduler/etc/Makefile.in @@ -391,7 +391,7 @@ run_tests: ${TEST_RUNNER} ${TEST_RUNNER_SH} -o ${TEST_RESULTS} -s ${TEST_XSLT} init: ${SCHEDULER_EXE} - ${SCHEDULER_SH} install + -${SCHEDULER_SH} install start: ${SCHEDULER_EXE} ${SCHEDULER_SH} start @@ -408,7 +408,7 @@ status: ${SCHEDULER_EXE} ${SCHEDULER_SH} status deinit: ${SCHEDULER_EXE} - ${SCHEDULER_SH} uninstall + -${SCHEDULER_SH} uninstall init_local: ${SCHEDULER_EXE} ${SCHEDULER_EXE} -c ${SCHEDULER_LOCAL_CFG} install