torrus

[freeside.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index aa87745..041c895 100755 (executable)
--- 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/usr/local/etc/freeside/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,7 +266,7 @@ 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.
 
@@ -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