[freeside-commits] freeside Makefile,1.180.2.4,1.180.2.5

Jeff Finucane,420,, jeff at wavetail.420.am
Mon Mar 1 11:11:09 PST 2010


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

Modified Files:
      Tag: FREESIDE_1_9_BRANCH
	Makefile 
Log Message:
get along better with RTless installs

Index: Makefile
===================================================================
RCS file: /home/cvs/cvsroot/freeside/Makefile,v
retrieving revision 1.180.2.4
retrieving revision 1.180.2.5
diff -u -w -d -r1.180.2.4 -r1.180.2.5
--- Makefile	8 Feb 2010 15:32:37 -0000	1.180.2.4
+++ Makefile	1 Mar 2010 19:11:07 -0000	1.180.2.5
@@ -362,12 +362,12 @@
 	|| true
 
 install-rt:
-	[ ${RT_ENABLED} -eq 1 ] && ( cd rt; make install ) || true
-	[ ${RT_ENABLED} -eq 1 ] && perl -p -i -e "\
+	if [ ${RT_ENABLED} -eq 1 ]; then ( cd rt; make install ); fi
+	if [ ${RT_ENABLED} -eq 1 ]; then perl -p -i -e "\
 	  s'%%%RT_DOMAIN%%%'${RT_DOMAIN}'g;\
 	  s'%%%RT_TIMEZONE%%%'${RT_TIMEZONE}'g;\
 	  s'%%%FREESIDE_URL%%%'${FREESIDE_URL}'g;\
-	" ${RT_PATH}/etc/RT_SiteConfig.pm
+	" ${RT_PATH}/etc/RT_SiteConfig.pm; fi
 
 clean:
 	rm -rf masondocs



More information about the freeside-commits mailing list