X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=debian%2Frules;h=041c895a40f2f28d96393df3a71527e2fc8928d6;hp=30bd292e8f1b312567aff1a11b4a5712a77b8825;hb=7f1abb22f7e7256eb4f2eee18791173590f3d9e3;hpb=a0e290603b2bba9a4c032396428b532cbcc2902d

diff --git a/debian/rules b/debian/rules
index 30bd292e8..041c895a4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,11 +48,12 @@ 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 INIT_FILE              = $(TMP).init
 export INIT_INSTALL           = /bin/true
 export HTTPD_RESTART          = /bin/true
 export APACHE_CONF           := $(shell [ ${APACHE_VERSION} = '2.4' ] && echo "$(TMP)-webui/etc/apache2/conf-available" || echo "$(TMP)-webui/etc/apache2/conf.d")
+export TORRUS_CONF           := $(shell [ ${APACHE_VERSION} = '2.4' ] && echo "$(TMP)-torrus/etc/apache2/conf-available" || echo "$(TMP)-torrus/etc/apache2/conf.d")
 export FREESIDE_RESTART       = /bin/true
 
 #XXX root?
@@ -75,7 +76,9 @@ 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
 
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
@@ -131,7 +134,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)
@@ -166,9 +168,8 @@ install-stamp: build-stamp
 	$(MAKE) -e DESTDIR=$(TMP)-webui install-docs
 	
 	# Install tex
-	install -D -o freeside -m 444 etc/longtable.sty \
-	$(TMP)-lib/usr/local/share/texmf/tex/latex/longtable.sty
-	texhash $(TMP)-lib/usr/local/share/texmf
+	install -d ${TEXMF_PATH}
+	install -o freeside -m 444 etc/*.sty ${TEXMF_PATH}
 
 	# Create Apache configurations
 	install -d $(APACHE_CONF)
@@ -227,12 +228,17 @@ install-stamp: build-stamp
 
 	# Torrus 
 	
-	install -d ${TMP}-torrus$(APACHE_DOCUMENT_ROOT)/
+	#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; \
 	$(MAKE) -e DESTDIR=${TMP}-torrus/; \
-	$(MAKE) -e DESTDIR=${TMP}-torrus/ install )
+	$(MAKE) -e DESTDIR=${TMP}-torrus/ install; \
+	perl -p -i -e "\
+	    s'%%%FREESIDE_URL%%%'${FREESIDE_URL}'g;\
+	" ${TMP}-torrus/usr/local/etc/torrus/conf/torrus-siteconfig.pl )
 
 	#RT Config
 
@@ -260,18 +266,19 @@ install-stamp: build-stamp
 	install -d $(RT_PATH)/share
 
 	( cd rt; $(MAKE) config-install dirs files-install fixperms instruct )
+	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 "\
@@ -292,7 +299,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