[freeside-commits] freeside Makefile,1.198,1.199

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside
In directory wavetail.420.am:/tmp/cvs-serv25329

Modified Files:
	Makefile 
Log Message:
torrus skinning improvements, RT#10574

Index: Makefile
===================================================================
RCS file: /home/cvs/cvsroot/freeside/Makefile,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -w -d -r1.198 -r1.199
--- Makefile	27 Dec 2010 08:40:19 -0000	1.198
+++ Makefile	29 Dec 2010 03:24:08 -0000	1.199
@@ -290,7 +290,7 @@
 	  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,13 @@
 	torrus_user=freeside var_user=freeside var_group=freeside ./configure
 
 install-torrus:
-	cd torrus; \
+	if [ ${TORRUS_ENABLED} -eq 1 ]; then ( cd torrus; \
 	make; \
-	make install
+	  make install; \
 	perl -p -i -e "\
 	  s'%%%FREESIDE_URL%%%'${FREESIDE_URL}'g;\
-	" /usr/local/etc/torrus/conf/torrus-siteconfig.pl
+	  " /usr/local/etc/torrus/conf/torrus-siteconfig.pl \
+	);fi
 
 clean:
 	rm -rf masondocs