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?
# 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