[freeside-commits] freeside Makefile,1.142,1.143

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside
In directory wavetail:/tmp/cvs-serv21493

Modified Files:
	Makefile 
Log Message:
mod_perl v2, it finally happened

Index: Makefile
===================================================================
RCS file: /home/cvs/cvsroot/freeside/Makefile,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -d -r1.142 -r1.143
--- Makefile	18 Dec 2006 08:08:57 -0000	1.142
+++ Makefile	21 Jan 2007 13:26:43 -0000	1.143
@@ -19,6 +19,10 @@
 MASON_HANDLER = ${FREESIDE_CONF}/handler.pl
 MASONDATA = ${FREESIDE_CACHE}/masondata
 
+#yup
+APACHE_VERSION = 1
+#APACHE_VERSION = 2
+
 # only mason now
 TEMPLATE = mason
 
@@ -231,11 +235,13 @@
 	${INIT_INSTALL}
 
 install-apache:
+	[ -e ${APACHE_CONF}/freeside-base.conf ] && rm ${APACHE_CONF}/freeside-base.conf || true
 	[ -d ${APACHE_CONF} ] && \
-	  ( install -o root -m 755 htetc/freeside-base.conf ${APACHE_CONF} && \
+	  ( install -o root -m 755 htetc/freeside-base${APACHE_VERSION}.conf ${APACHE_CONF} && \
 	    ( [ ${RT_ENABLED} -eq 1 ] && install -o root -m 755 htetc/freeside-rt.conf ${APACHE_CONF} || true ) && \
 	    perl -p -i -e "\
 	      s'%%%FREESIDE_DOCUMENT_ROOT%%%'${FREESIDE_DOCUMENT_ROOT}'g; \
+	      s'%%%MASON_HANDLER%%%'${MASON_HANDLER}'g; \
 	    " ${APACHE_CONF}/freeside-*.conf \
 	  ) || true