Jessie support for FREESIDE_3_BRANCH
authorJeremy Davis <jeremyd@freeside.biz>
Thu, 21 May 2015 14:47:56 +0000 (10:47 -0400)
committerJeremy Davis <jeremyd@freeside.biz>
Thu, 21 May 2015 14:47:56 +0000 (10:47 -0400)
Makefile

index 5a1d61a..ab27c00 100644 (file)
--- 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 "\