Merge branch 'master' of git.freeside.biz:/home/git/freeside

[freeside.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index 2faf1bd..f390072 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -53,6 +53,7 @@ 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?
@@ -227,17 +228,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 ${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 )
-
-        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