X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=Makefile;h=d815c44ed7f1fd7532067451389e6544abdf09da;hp=3af5da81253315cd09dacfa99b297c36a19ade17;hb=38e34bbc53a4222c7507e95914e1364a5a74623f;hpb=9aee669886202be7035e6c6049fc71bc99dd3013

diff --git a/Makefile b/Makefile
index 3af5da812..d815c44ed 100644
--- a/Makefile
+++ b/Makefile
@@ -49,6 +49,8 @@ FREESIDE_DOCUMENT_ROOT := $(shell [ ${APACHE_VERSION} = '2.4' ] && echo '/var/ww
 #apache
 #FREESIDE_DOCUMENT_ROOT = /usr/local/apache/htdocs/freeside
 
+POD2HTML_DIR = ${FREESIDE_DOCUMENT_ROOT}/docs/library
+
 #deb, redhat, fedora, mandrake, suse, others?
 INIT_FILE = /etc/init.d/freeside
 #freebsd
@@ -117,7 +119,7 @@ FREESIDE_URL = "http://localhost/freeside/"
 #for now, same db as specified in DATASOURCE... eventually, otherwise?
 RT_DB_DATABASE = freeside
 
-TORRUS_ENABLED = 0
+#TORRUS_ENABLED = 1
 
 # for auto-version updates, so we can "make release" more things automatically
 RPM_SPECFILE = rpm/freeside.spec
@@ -129,7 +131,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.24.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,9 +196,10 @@ install-docs: docs
 	" ${MASON_HANDLER} || true
 	mkdir -p ${FREESIDE_EXPORT}/profile
 	chown freeside ${FREESIDE_EXPORT}/profile
-	rm -r ${MASONDATA}
-	mkdir ${MASONDATA}
-	chown -R freeside ${MASONDATA}
+	rm -rf ${MASONDATA}/*
+	mkdir ${MASONDATA}/cache || true
+	mkdir ${MASONDATA}/obj || true
+	chown -f -R freeside ${MASONDATA} || true
 
 dev-docs:
 	[ -e ${FREESIDE_DOCUMENT_ROOT} ] && mv ${FREESIDE_DOCUMENT_ROOT} ${FREESIDE_DOCUMENT_ROOT}.`date +%Y%m%d%H%M%S` || true
@@ -216,6 +219,7 @@ perl-modules:
 	perl -p -i -e "\
 	  s|%%%FREESIDE_CONF%%%|${FREESIDE_CONF}|g;\
 	  s|%%%FREESIDE_CACHE%%%|${FREESIDE_CACHE}|g;\
+	  s|%%%FREESIDE_LOG%%%|${FREESIDE_LOG}|g;\
 	  s'%%%FREESIDE_DOCUMENT_ROOT%%%'${FREESIDE_DOCUMENT_ROOT}'g; \
 	  s'%%%RT_ENABLED%%%'${RT_ENABLED}'g; \
 	  s'%%%RT_PATH%%%'${RT_PATH}'g; \
@@ -234,7 +238,7 @@ perl-modules:
 	" blib/lib/FS/part_export/*.pm;\
 	perl -p -i -e "\
 	  s|%%%FREESIDE_CACHE%%%|${FREESIDE_CACHE}|g;\
-	" blib/lib/FS/cust_main/*.pm blib/lib/FS/cust_pkg/*.pm;\
+	" blib/lib/FS/cust_main/*.pm blib/lib/FS/cust_pkg/*.pm blib/lib/FS/contact/*.pm;\
 	perl -p -i -e "\
 	  s|%%%FREESIDE_LOG%%%|${FREESIDE_LOG}|g;\
 	" blib/lib/FS/Daemon/*.pm;\
@@ -269,6 +273,7 @@ dev-perl-modules: perl-modules
 	ln -sf ${FREESIDE_PATH}/FS/blib/lib/FS ${PERL_INC_DEV_KLUDGE}/FS
 
 install-texmf:	
+	mkdir -p /usr/local/share/texmf/tex/latex
 	install -D -o freeside -m 444 etc/*.sty \
 	  /usr/local/share/texmf/tex/latex/
 	texhash /usr/local/share/texmf
@@ -325,7 +330,13 @@ install-chown:
 	chown freeside "${FREESIDE_CACHE}/cache.${DATASOURCE}"
 	chown freeside "${FREESIDE_EXPORT}/export.${DATASOURCE}"
 
-install: install-perl-modules install-docs install-init install-apache install-rt install-torrus install-texmf install-chown
+install-pod2html:
+	echo "${POD2HTML_DIR}"
+	mkdir -p "${POD2HTML_DIR}"
+	perl -IFS -MFS::Misc::Pod2Html -e "FS::Misc::Pod2Html::fs_pod2html_from_src('${POD2HTML_DIR}');"
+	chown freeside:freeside -R "${POD2HTML_DIR}"
+
+install: install-perl-modules install-docs install-init install-apache install-rt install-torrus install-texmf install-chown install-pod2html
 
 deploy: install
 	${HTTPD_RESTART}
@@ -400,6 +411,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;\