X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=debian%2Frules;h=f390072408139d23f508b6f0587c3bf0f3410bc9;hb=0cabf7d128df2d7286edc9697e311027eb94c596;hp=45f2ce8ed7bd6b5f870a2a20a8f8ec5d76df4c44;hpb=4b619ddc65ac8c256de2d99f63be46380ca0e8e0;p=freeside.git diff --git a/debian/rules b/debian/rules index 45f2ce8ed..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,8 +228,8 @@ 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; \