summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorivan <ivan>2004-03-13 00:50:43 +0000
committerivan <ivan>2004-03-13 00:50:43 +0000
commitf82a3770acd9fcc07b75fa00b53968f21458fb12 (patch)
treed227d58e10a450054611b353b143ae061258581f
parent2a86b05af4e768ce549bc624af0027f26cf482bb (diff)
automatically set Mason comp_root in Makefile
-rw-r--r--Makefile4
-rw-r--r--htetc/handler.pl2
2 files changed, 5 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index cff2d8e6a..9720b29c4 100644
--- 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 692140817..45f81b3b9 100644
--- 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',
);