fix up includes with Apache::ASP

diff --git a/Makefile b/Makefile
index bf73202..6d3d803 100644 (file)
--- 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" -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 "\
        [ "${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 dace295..4358e87 100644 (file)
--- a/htetc/global.asa
+++ b/htetc/global.asa
@@ -197,9 +197,8 @@ sub sprintAutoProfile {
 }
 
 sub include {
 }
 
 sub include {

-  ( my $file = shift ) =~ s(^/)();
-  $Response->Include($file, @_);
-  '';
+  ( my $file = shift ) =~ s(^/)(%%%FREESIDE_DOCUMENT_ROOT%%%/);
+  ${$Response->TrapInclude($file, @_)};

 }
 
 if ( defined(@DBIx::Profile::ISA) ) {
 }
 
 if ( defined(@DBIx::Profile::ISA) ) {