X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=debian%2Frules;h=88a0dfb97f3d17b10ad510bbc47143d97694fa64;hp=e7f5bd8a0af5c33a17016a396818c7050a131093;hb=7c59a1f6e4d529f1f367a5b7e4001e2b8d4717ca;hpb=42e6fdc16b285430d50607489aa3e1394fafbc16

diff --git a/debian/rules b/debian/rules
index e7f5bd8a0..88a0dfb97 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,7 +48,8 @@ export MASON_HANDLER=$(TMP)-webui/usr/local/etc/freeside/handler.pl
 
 export APACHE_VERSION        := $(shell /usr/sbin/apache2 -v | grep -q '\/2\.4\.' && echo '2.4' || echo '2')
 export APACHE_DOCUMENT_ROOT  := $(shell [ ${APACHE_VERSION} = '2.4' ] && echo '/var/www/html' || echo '/var/www')
-export FREESIDE_DOCUMENT_ROOT = $(TMP)$(APACHE_DOCUMENT_ROOT)/freeside
+export FREESIDE_DOCUMENT_ROOT = $(TMP)-webui$(APACHE_DOCUMENT_ROOT)/freeside
+export POD2HTML_DOCUMENT_ROOT = $(FREESIDE_DOCUMENT_ROOT)/docs/library
 export INIT_FILE              = $(TMP).init
 export INIT_INSTALL           = /bin/true
 export HTTPD_RESTART          = /bin/true
@@ -76,7 +77,7 @@ export FREESIDE_URL           = http://$(HOSTNAME)/freeside/
 # a kludge to hack it out afterwords.  look into using fakeroot (didn't
 # realize it would need to be explicit argh)
 # (but leaving it for now, otherwise can't get RT to put files where we need em)
-export RT_PATH                = $(TMP)/opt/rt3
+export RT_PATH                = $(TMP)-lib/opt/rt3
 
 export TEXMF_PATH             = $(TMP)-lib/usr/local/share/texmf/tex/latex
 
@@ -134,7 +135,6 @@ install-stamp: build-stamp
 	install -d $(TMP)-webui/usr/local/etc/freeside/
 	install -d $(TMP)-webui/etc/insserv/overrides/
 	install -d $(TMP)/usr/local/etc/freeside/
-	install -d $(FREESIDE_CACHE)/masondata #MASONDATA
 #	install -d $(TMP)-lib/usr/bin
 
 	( cd FS/ && $(MAKE) -e DESTDIR=${TMP}-lib install)
@@ -171,8 +171,9 @@ install-stamp: build-stamp
 	# Install tex
 	install -d ${TEXMF_PATH}
 	install -o freeside -m 444 etc/*.sty ${TEXMF_PATH}
+	install -o root -m 444 -D etc/GnuMICR.otf $(TMP)-lib/usr/local/etc/freeside/GnuMICR.otf
 
-	# Create Apache configurations
+# Create Apache configurations
 	install -d $(APACHE_CONF)
 	$(MAKE) -e DESTDIR=$(APACHE_CONF) install-apache
 	install -o root -m 755 init.d/insserv-override-apache2 $(TMP)-webui/etc/insserv/overrides/apache2
@@ -229,8 +230,9 @@ install-stamp: build-stamp
 
 	# Torrus 
 	
-	install -d ${TORRUS_CONF}
-	install -o root -m 755 htetc/freeside-torrus.conf $(TORRUS_CONF)/
+	#in freeside-webui package
+	#install -d ${TORRUS_CONF}
+	#install -o root -m 755 htetc/freeside-torrus.conf $(TORRUS_CONF)/
 
 	( cd torrus; \
 	torrus_user=freeside var_user=freeside var_group=freeside ./configure; \
@@ -266,19 +268,19 @@ install-stamp: build-stamp
 	install -d $(RT_PATH)/share
 
 	( cd rt; $(MAKE) config-install dirs files-install fixperms instruct )
-	cp -r ${RT_PATH}/share/static/images ${FREESIDE_DOCUMENT_ROOT}/rt/NoAuth/
+	cp -r rt/share/static/images ${FREESIDE_DOCUMENT_ROOT}/rt/NoAuth/
 	
 	##hack the build dir out of RT.  yeah, sucky.
 
 	perl -p -i -e "\
-	s'${TMP}(-webui)''g;\
+	s'${TMP}(-webui|-lib)''g;\
 	s'${TMP}''g;\
-	" ${TMP}/opt/rt3/etc/*.pm \
-		${TMP}/opt/rt3/lib/*.pm \
-		${TMP}/opt/rt3/lib/RT/*.pm \
-		${TMP}/opt/rt3/etc/upgrade/* \
-		${TMP}/opt/rt3/sbin/* \
-		${TMP}/opt/rt3/bin/* \
+	" ${TMP}-lib/opt/rt3/etc/*.pm \
+		${TMP}-lib/opt/rt3/lib/*.pm \
+		${TMP}-lib/opt/rt3/lib/RT/*.pm \
+		${TMP}-lib/opt/rt3/etc/upgrade/* \
+		${TMP}-lib/opt/rt3/sbin/* \
+		${TMP}-lib/opt/rt3/bin/* \
 
 	# Default RT Settings
 	perl -p -i -e "\
@@ -287,6 +289,10 @@ install-stamp: build-stamp
 		s'%%%FREESIDE_URL%%%'${FREESIDE_URL}'g;\
 		" ${RT_PATH}/etc/RT_SiteConfig.pm
 
+	# Build pod2html documentation
+	install -d ${POD2HTML_DOCUMENT_ROOT}
+	perl -IFS -MFS::Misc::Pod2Html -e "FS::Misc::Pod2Html::fs_pod2html_from_src('${POD2HTML_DOCUMENT_ROOT}');"
+
 	dh_install
 
 	#touch $@
@@ -299,7 +305,7 @@ binary-indep: build install
 	dh_testroot
 	dh_installdeb install
 	dh_installdocs #freeside.docs README AGPL
-	dh_installexamples eg/*
+	dh_installexamples eg bin
 #	dh_installmenu
 	dh_installdebconf	
 #	dh_installlogrotate