automatically set Mason comp_root in Makefile

diff --git a/Makefile b/Makefile
index 3c46838..1b212b3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -121,6 +121,10 @@ install-docs: docs
        [ "${TEMPLATE}" = "asp" ] && chown -R freeside ${ASP_GLOBAL} || true
        [ "${TEMPLATE}" = "asp" ] && cp htetc/global.asa ${ASP_GLOBAL} || true
        [ "${TEMPLATE}" = "mason" ] && cp htetc/handler.pl ${MASON_HANDLER} || true
+       [ "${TEMPLATE}" = "mason" ] &&
+         perl -p -i -e "\
+           s/%%%FREESIDE_DOCUMENT_ROOT%%%/${FREESIDE_DOCUMENT_ROOT}/g;
+         " ${MASON_HANDLER}
        [ "${TEMPLATE}" = "mason" -a ! -e ${MASONDATA} ] && mkdir ${MASONDATA} || true
        [ "${TEMPLATE}" = "mason" ] && chown -R freeside ${MASONDATA} || true
 

diff --git a/htetc/handler.pl b/htetc/handler.pl
index 0301d98..8541b4c 100644 (file)
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -38,7 +38,7 @@ use strict;
 my $ah = new HTML::Mason::ApacheHandler (
   #interp => $interp,
   #auto_send_headers => 0,
-  comp_root=>'/var/www/freeside',
+  comp_root=>'%%%FREESIDE_DOCUMENT_ROOT%%%',
   data_dir=>'/usr/local/etc/freeside/masondata',
   #out_mode=>'stream',
 );