From 686e4d8cf9a69012cbf92983a787644d583bdcd8 Mon Sep 17 00:00:00 2001 From: ivan Date: Fri, 23 Apr 2004 12:50:34 +0000 Subject: [PATCH] fix up includes with Apache::ASP --- Makefile | 4 ++++ htetc/global.asa | 5 ++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index bf73202f6..6d3d80397 100644 --- a/Makefile +++ b/Makefile @@ -129,6 +129,10 @@ install-docs: docs [ "${TEMPLATE}" = "asp" -a ! -e ${ASP_GLOBAL} ] && mkdir ${ASP_GLOBAL} || true [ "${TEMPLATE}" = "asp" ] && chown -R freeside ${ASP_GLOBAL} || true [ "${TEMPLATE}" = "asp" ] && cp htetc/global.asa ${ASP_GLOBAL} || true + [ "${TEMPLATE}" = "asp" ] && \ + perl -p -i -e "\ + s'%%%FREESIDE_DOCUMENT_ROOT%%%'${FREESIDE_DOCUMENT_ROOT}'g; \ + " ${ASP_GLOBAL}/global.asa || true [ "${TEMPLATE}" = "mason" ] && cp htetc/handler.pl ${MASON_HANDLER} || true [ "${TEMPLATE}" = "mason" ] && \ perl -p -i -e "\ diff --git a/htetc/global.asa b/htetc/global.asa index dace29527..4358e87b1 100644 --- a/htetc/global.asa +++ b/htetc/global.asa @@ -197,9 +197,8 @@ sub sprintAutoProfile { } sub include { - ( my $file = shift ) =~ s(^/)(); - $Response->Include($file, @_); - ''; + ( my $file = shift ) =~ s(^/)(%%%FREESIDE_DOCUMENT_ROOT%%%/); + ${$Response->TrapInclude($file, @_)}; } if ( defined(@DBIx::Profile::ISA) ) { -- 2.11.0