X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=Makefile;h=4c23b8dba4e13bbbf500a088a3c629f6e3ff44a4;hb=a0a5a11af6648c147a1e68877ac099035c18790a;hp=ed77ff869d50c4ea364dad4278807c7fa9042b7c;hpb=1163d4d5044ca487ae9cf2176346e297979aa1e1;p=freeside.git

diff --git a/Makefile b/Makefile
index ed77ff869..4c23b8dba 100644
--- a/Makefile
+++ b/Makefile
@@ -19,6 +19,10 @@ FREESIDE_EXPORT = /usr/local/etc/freeside
 MASON_HANDLER = ${FREESIDE_CONF}/handler.pl
 MASONDATA = ${FREESIDE_CACHE}/masondata
 
+#yup
+APACHE_VERSION = 1
+#APACHE_VERSION = 2
+
 # only mason now
 TEMPLATE = mason
 
@@ -177,6 +181,7 @@ dev-docs:
 	perl -p -i -e "\
 	  s'%%%FREESIDE_DOCUMENT_ROOT%%%'${FREESIDE_DOCUMENT_ROOT}'g; \
 	  s'%%%RT_ENABLED%%%'${RT_ENABLED}'g; \
+	  s'%%%MASONDATA%%%'${MASONDATA}'g;\
 	  s'###use Module::Refresh;###'use Module::Refresh;'; \
 	  s'###Module::Refresh->refresh;###'Module::Refresh->refresh;'; \
 	" ${MASON_HANDLER} || true
@@ -230,11 +235,13 @@ install-init:
 	${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