Merge branch 'master' of git.freeside.biz:/home/git/freeside

[freeside.git] / Makefile

diff --git a/Makefile b/Makefile
index 2976e74..c6eef91 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -195,6 +195,8 @@ install-docs: docs
        mkdir -p ${FREESIDE_EXPORT}/profile
        chown freeside ${FREESIDE_EXPORT}/profile
        rm -rf ${MASONDATA}/*
+       mkdir ${MASONDATA}/cache || true
+       mkdir ${MASONDATA}/obj || true
        chown -f -R freeside ${MASONDATA} || true
 
 dev-docs:
@@ -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; \