X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=debian%2Frules;h=f390072408139d23f508b6f0587c3bf0f3410bc9;hp=2faf1bd0156c82066c9b7973272df3b18551af99;hb=379c06ccd4b984bfa8130d98f862799239a8d00c;hpb=458f6fc84389aa3d4679380bb15aad74bdec0cb3

diff --git a/debian/rules b/debian/rules
index 2faf1bd01..f39007240 100755
--- 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