X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=Makefile;h=478bb2643d04fefe2a0b0bbb9dd73beca079c7f9;hp=2a8d93c2f1232b33d502f123e8fcf4309f7704a3;hb=da86d5a8af2f915a340a74f6c97772451a1e23ef;hpb=3f8ef5c72aa4fbfad5c320d91abdd4f2d547c029

diff --git a/Makefile b/Makefile
index 2a8d93c2f..478bb2643 100644
--- a/Makefile
+++ b/Makefile
@@ -290,7 +290,7 @@ update-selfservice:
 	  ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "cd FS-SelfService; sudo make install" ;\
 	done
 
-install: install-perl-modules install-docs install-init install-apache install-rt install-texmf
+install: install-perl-modules install-docs install-init install-apache install-rt install-torrus install-texmf
 
 deploy: install
 	${HTTPD_RESTART}
@@ -382,12 +382,14 @@ configure-torrus:
 	torrus_user=freeside var_user=freeside var_group=freeside ./configure
 
 install-torrus:
-	cd torrus; \
-	make; \
-	make install
-	perl -p -i -e "\
-	  s'%%%FREESIDE_URL%%%'${FREESIDE_URL}'g;\
-	" /usr/local/etc/torrus/conf/torrus-siteconfig.pl
+	if [ ${TORRUS_ENABLED} -eq 1 ]; then ( cd torrus; \
+	  make; \
+	  make install; \
+	  perl -p -i -e "\
+	    s'%%%FREESIDE_URL%%%'${FREESIDE_URL}'g;\
+	  " /usr/local/etc/torrus/conf/torrus-siteconfig.pl; \
+	  torrus clearcache \
+	);fi
 
 clean:
 	rm -rf masondocs