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

diff --git a/debian/rules b/debian/rules
index e7f5bd8a0..334b6528f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,7 +48,7 @@ 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
@@ -76,7 +76,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 +134,7 @@ 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)-webui/masondata #MASONDATA
 #	install -d $(TMP)-lib/usr/bin
 
 	( cd FS/ && $(MAKE) -e DESTDIR=${TMP}-lib install)
@@ -271,14 +271,14 @@ install-stamp: build-stamp
 	##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 "\
@@ -299,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