[freeside-commits] freeside Makefile,1.196.2.7,1.196.2.8

[Ivan,,,]

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

Modified Files:
      Tag: FREESIDE_2_1_BRANCH
	Makefile 
Log Message:
added protection to Makfile against deploying cvs conflicts

Index: Makefile
===================================================================
RCS file: /home/cvs/cvsroot/freeside/Makefile,v
retrieving revision 1.196.2.7
retrieving revision 1.196.2.8
diff -u -w -d -r1.196.2.7 -r1.196.2.8
--- Makefile	7 Jun 2011 03:11:54 -0000	1.196.2.7
+++ Makefile	15 Jun 2011 01:37:52 -0000	1.196.2.8
@@ -166,7 +166,7 @@
 	chmod a+rx ./bin/pod2x
 	./bin/pod2x
 
-install-docs: docs
+install-docs: check-conflicts docs
 	[ -e ${FREESIDE_DOCUMENT_ROOT} ] && mv ${FREESIDE_DOCUMENT_ROOT} ${FREESIDE_DOCUMENT_ROOT}.`date +%Y%m%d%H%M%S` || true
 	cp -r masondocs ${FREESIDE_DOCUMENT_ROOT}
 	chown -R freeside:freeside ${FREESIDE_DOCUMENT_ROOT}
@@ -221,7 +221,7 @@
 	  s|%%%DIST_CONF%%%|${DIST_CONF}|g;\
 	" blib/script/*
 
-install-perl-modules: perl-modules install-rt-initialdata
+install-perl-modules: check-conflicts perl-modules install-rt-initialdata
 	[ -L ${PERL_INC_DEV_KLUDGE}/FS ] \
 	  && rm ${PERL_INC_DEV_KLUDGE}/FS \
 	  && mv ${PERL_INC_DEV_KLUDGE}/FS.old ${PERL_INC_DEV_KLUDGE}/FS \
@@ -367,7 +367,7 @@
 	                             --datafile ${RT_PATH}/etc/initialdata \
 	|| true
 
-install-rt:
+install-rt: check-conflicts
 	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;\
@@ -393,6 +393,9 @@
 	-cd fs_selfservice/FS-SelfService; \
 	make clean
 
+check-conflicts:
+	! grep -r --exclude=config.log --exclude=config.status --exclude=gnupg_details_on_output_formats '^=======$$' .
+
 #these are probably only useful if you're me...
 
 #release: upload-docs