X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=Makefile;h=6f96d8bb4405c2b715f66c4a511a65bf77cfefbf;hb=2174469c067129252ed59918002a629bf770fdab;hp=ff363302ef8d4bcdbc0f2eb2c81b49fc76cdbb69;hpb=2ea9491004cdaeefd67bd011c9885464c200e957;p=freeside.git

diff --git a/Makefile b/Makefile
index ff363302e..6f96d8bb4 100644
--- a/Makefile
+++ b/Makefile
@@ -166,7 +166,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}
@@ -221,7 +221,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 \
@@ -367,13 +367,15 @@ 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;\
 	  s'%%%RT_TIMEZONE%%%'${RT_TIMEZONE}'g;\
 	  s'%%%FREESIDE_URL%%%'${FREESIDE_URL}'g;\
 	" ${RT_PATH}/etc/RT_SiteConfig.pm; fi
+	if [ ${RT_ENABLED} -eq 1 ]; then \
+	  chown -R freeside:freeside ${RT_PATH}/etc; fi
 
 install-rt-initialdata:
 	if [ ${RT_ENABLED} -eq 1 ] && [ -d ${RT_PATH} ]; then \
@@ -391,6 +393,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 '--exclude=*mason_handler*' '^=======$$' .
+
 #these are probably only useful if you're me...
 
 #release: upload-docs