From: Ivan Kohler <ivan@freeside.biz>
Date: Sun, 26 Jul 2015 22:41:26 +0000 (-0700)
Subject: Merge branch 'master' of git.freeside.biz:/home/git/freeside
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=9aee669886202be7035e6c6049fc71bc99dd3013;hp=-c

Merge branch 'master' of git.freeside.biz:/home/git/freeside
---

9aee669886202be7035e6c6049fc71bc99dd3013
diff --combined Makefile
index e2ea2beb1,02ab78cc5..3af5da812
--- a/Makefile
+++ b/Makefile
@@@ -129,7 -129,7 +129,7 @@@ RT_PATH = /opt/rt
  
  #only used for dev kludge now, not a big deal
  FREESIDE_PATH = `pwd`
 -PERL_INC_DEV_KLUDGE = /usr/local/share/perl/5.14.2/
 +PERL_INC_DEV_KLUDGE = /usr/local/share/perl/5.20.2/
  
  VERSION := `grep '^$$VERSION' FS/FS.pm | cut -d\' -f2`
  TAG := freeside_`grep '^$$VERSION' FS/FS.pm | cut -d\' -f2 | perl -pe 's/\./_/g'`
@@@ -194,7 -194,8 +194,8 @@@ install-docs: doc
  	" ${MASON_HANDLER} || true
  	mkdir -p ${FREESIDE_EXPORT}/profile
  	chown freeside ${FREESIDE_EXPORT}/profile
- 	[ ! -e ${MASONDATA} ] && mkdir ${MASONDATA} || true
+ 	rm -r ${MASONDATA}
+ 	mkdir ${MASONDATA}
  	chown -R freeside ${MASONDATA}
  
  dev-docs:
@@@ -268,8 -269,8 +269,8 @@@ dev-perl-modules: perl-module
  	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: