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

diff --git a/debian/rules b/debian/rules
index 334b6528f..041c895a4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -134,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 $(TMP)-webui/masondata #MASONDATA
 #	install -d $(TMP)-lib/usr/bin
 
 	( cd FS/ && $(MAKE) -e DESTDIR=${TMP}-lib install)
@@ -229,8 +228,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 +266,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|-lib)''g;\
 	s'${TMP}''g;\
-	" ${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/* \
+	" ${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/* bin/*
+	dh_installexamples eg bin
 #	dh_installmenu
 	dh_installdebconf	
 #	dh_installlogrotate