X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=Makefile;h=4e6ffa32249d80db0545df91fa35fa9bd2595a13;hp=5a1d61a3d607a543c43ec05a2876a170821f6ab2;hb=refs%2Fheads%2FFREESIDE_3_BRANCH_71513;hpb=bc902905984f85eab84fee1bd9adfe98b022e660 diff --git a/Makefile b/Makefile index 5a1d61a3d..4e6ffa322 100644 --- 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: @@ -269,8 +270,8 @@ dev-perl-modules: perl-modules ln -sf ${FREESIDE_PATH}/FS/blib/lib/FS ${PERL_INC_DEV_KLUDGE}/FS install-texmf: - install -D -o freeside -m 444 etc/longtable.sty \ - /usr/local/share/texmf/tex/latex/longtable.sty + install -D -o freeside -m 444 etc/*.sty \ + /usr/local/share/texmf/tex/latex/ texhash /usr/local/share/texmf install-init: @@ -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 "\ @@ -400,6 +401,7 @@ create-rt: configure-rt install-rt: if [ ${RT_ENABLED} -eq 1 ]; then ( cd rt; make install ); fi + if [ ${RT_ENABLED} -eq 1 ]; then cp -r rt/share/static/images ${FREESIDE_DOCUMENT_ROOT}/rt/NoAuth/ ;fi if [ ${RT_ENABLED} -eq 1 ]; then perl -p -i -e "\ s'%%%RT_DOMAIN%%%'${RT_DOMAIN}'g;\ s'%%%RT_TIMEZONE%%%'${RT_TIMEZONE}'g;\