X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=Makefile;h=a454d08de9fecd19803f69d3c8375ea01c34fb10;hb=970dfae19db81ed3afdd9f7e15637907f84d5341;hp=59f5e2fd87349adef0e2908de257ddb07f3ab2af;hpb=0648ec59705ca8c020403d5352fcfcec02e5b5da;p=freeside.git

diff --git a/Makefile b/Makefile
index 59f5e2fd8..a454d08de 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}
@@ -193,6 +193,7 @@ perl-modules:
 	  s'%%%RT_ENABLED%%%'${RT_ENABLED}'g; \
 	  s'%%%RT_PATH%%%'${RT_PATH}'g; \
 	  s'%%%MASONDATA%%%'${MASONDATA}'g;\
+	  s/%%%SELFSERVICE_USER%%%/${SELFSERVICE_USER}/g;\
 	" blib/lib/FS/*.pm;\
 	perl -p -i -e "\
 	  s/%%%SELFSERVICE_USER%%%/${SELFSERVICE_USER}/g;\
@@ -216,7 +217,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 +369,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 +409,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