X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=Makefile;h=c9239e6b5f5a1468f77b3d82e55679f1f6b7ed70;hb=3bfdeb08960dd59c5ad3d202aa8d8c4df10a8a3d;hp=91b14b8a82bff43cbcc9fd6af715baaaed302d56;hpb=42e6fdc16b285430d50607489aa3e1394fafbc16;p=freeside.git diff --git a/Makefile b/Makefile index 91b14b8a8..c9239e6b5 100644 --- a/Makefile +++ b/Makefile @@ -129,7 +129,7 @@ RT_PATH = /opt/rt3 #only used for dev kludge now, not a big deal FREESIDE_PATH = `pwd` -PERL_INC_DEV_KLUDGE = /usr/local/share/perl/5.20.2/ +PERL_INC_DEV_KLUDGE = /usr/local/share/perl/5.22.1/ VERSION := `grep '^$$VERSION' FS/FS.pm | cut -d\' -f2` TAG := freeside_`grep '^$$VERSION' FS/FS.pm | cut -d\' -f2 | perl -pe 's/\./_/g'` @@ -194,8 +194,7 @@ install-docs: docs " ${MASON_HANDLER} || true mkdir -p ${FREESIDE_EXPORT}/profile chown freeside ${FREESIDE_EXPORT}/profile - rm -r ${MASONDATA} - mkdir ${MASONDATA} + rm -rf ${MASONDATA}/* chown -R freeside ${MASONDATA} dev-docs: @@ -400,7 +399,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_PATH}/share/static/images ${FREESIDE_DOCUMENT_ROOT}/rt/NoAuth/ ;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;\