Ticket #36913 Correct config file and automate post install tasks

[freeside.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index 2faf1bd..3181fe8 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -227,17 +227,16 @@ install-stamp: build-stamp
 
        # Torrus 
        
-       install -d ${TMP}-torrus$(APACHE_DOCUMENT_ROOT)/
-        install -o root -m 755 htetc/freeside-torrus.conf ${TMP}-torrus$(APACHE_DOCUMENT_ROOT)/
+       install -d ${TMP}-torrus${APACHE_CONF}
+       install -o root -m 755 htetc/freeside-torrus.conf ${TMP}-torrus$(APACHE_CONF)/
 
        ( cd torrus; \
        torrus_user=freeside var_user=freeside var_group=freeside ./configure; \
        $(MAKE) -e DESTDIR=${TMP}-torrus/; \
-       $(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; \
+       $(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