Commit 900de692 authored by miller86's avatar miller86

Merging 1.12RC to trunk: changing error message for env-make var collision...

Merging 1.12RC to trunk: changing error message for env-make var collision check to indicate the override switch can be set in the env.

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@7940 18c085ea-50e0-402c-830e-de6fd14e8384
parent d860bbb7
......@@ -257,8 +257,8 @@ check-make-and-env-vars:
echo "Please temporarily remove these variables from your enviornment"; \
echo "using unsetenv (csh) or unset (sh) before proceeding. Or,"; \
echo "you may instead and at your own risk, override this error by"; \
echo "adding 'VISIT_NOCKENV=1' to your make command line."; \
echo "(e.g. 'make VISIT_NOCKENV=1')."; \
echo "adding 'VISIT_NOCKENV=1' to your make command line or set."; \
echo "set VISIT_NOCKENV to 1 in your enviornment."; \
exit 1; \
else \
echo "OK"; \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment