74355: freeside-upgrade error N/A (tokenized) [better error handling for encryption...

[freeside.git] / Makefile

diff --git a/Makefile b/Makefile
index c9239e6..c6eef91 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -195,7 +195,9 @@ install-docs: docs
        mkdir -p ${FREESIDE_EXPORT}/profile
        chown freeside ${FREESIDE_EXPORT}/profile
        rm -rf ${MASONDATA}/*
-       chown -R freeside ${MASONDATA}
+       mkdir ${MASONDATA}/cache || true
+       mkdir ${MASONDATA}/obj || true
+       chown -f -R freeside ${MASONDATA} || true
 
 dev-docs:
        [ -e ${FREESIDE_DOCUMENT_ROOT} ] && mv ${FREESIDE_DOCUMENT_ROOT} ${FREESIDE_DOCUMENT_ROOT}.`date +%Y%m%d%H%M%S` || true
@@ -215,6 +217,7 @@ perl-modules:
        perl -p -i -e "\
          s|%%%FREESIDE_CONF%%%|${FREESIDE_CONF}|g;\
          s|%%%FREESIDE_CACHE%%%|${FREESIDE_CACHE}|g;\
+         s|%%%FREESIDE_LOG%%%|${FREESIDE_LOG}|g;\
          s'%%%FREESIDE_DOCUMENT_ROOT%%%'${FREESIDE_DOCUMENT_ROOT}'g; \
          s'%%%RT_ENABLED%%%'${RT_ENABLED}'g; \
          s'%%%RT_PATH%%%'${RT_PATH}'g; \