From 30e0af53bde61f5272c942814140b78ce44815a5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 15 Jun 2011 01:37:52 +0000
Subject: [PATCH] added protection to Makfile against deploying cvs conflicts

---
 Makefile | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 59f5e2fd8..8db4c1e49 100644
--- a/Makefile
+++ b/Makefile
@@ -161,7 +161,7 @@ wikiman:
 	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}
@@ -216,7 +216,7 @@ perl-modules:
 	  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 \
@@ -368,7 +368,7 @@ create-rt: configure-rt
 	                             --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;\
@@ -408,6 +408,9 @@ clean:
 	-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
-- 
2.11.0