Debian 8 support for ng-selfservice

[freeside.git] / Makefile

diff --git a/Makefile b/Makefile
index 5a1d61a..678ae51 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -195,7 +195,8 @@ install-docs: docs
        mkdir -p ${FREESIDE_EXPORT}/profile
        chown freeside ${FREESIDE_EXPORT}/profile
        cp htetc/htpasswd.logout ${FREESIDE_CONF}
-       [ ! -e ${MASONDATA} ] && mkdir ${MASONDATA} || true
+       rm -r ${MASONDATA}
+       mkdir ${MASONDATA}
        chown -R freeside ${MASONDATA}
 
 dev-docs:
@@ -287,7 +288,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 "\