summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJeremy Davis <jeremyd@freeside.biz>2015-05-21 10:47:56 -0400
committerJeremy Davis <jeremyd@freeside.biz>2015-05-21 10:47:56 -0400
commite51dc8ee781dee3d6b2c63bc5164c9fd763a9a5c (patch)
tree2defe0f6fc98d7ee1049d13436e11ca3b386d7b9 /Makefile
parent1b5c30ddf2cf14c5a1196677111a9bd2b8e3521d (diff)
Jessie support for FREESIDE_3_BRANCH
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 5a1d61a3d..ab27c0079 100644
--- a/Makefile
+++ b/Makefile
@@ -287,7 +287,7 @@ install-init:
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${APACHE_VERSION}.conf ${APACHE_CONF} && \
+ ( install -o root -m 755 htetc/freeside-base2.conf ${APACHE_CONF} && \
( [ ${RT_ENABLED} -eq 1 ] && install -o root -m 755 htetc/freeside-rt.conf ${APACHE_CONF} || true ) && \
( [ ${TORRUS_ENABLED} -eq 1 ] && install -o root -m 755 htetc/freeside-torrus.conf ${APACHE_CONF} || true ) && \
perl -p -i -e "\