ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From peterrei...@apache.org
Subject svn commit: r463867 - /ant/core/trunk/src/script/ant
Date Fri, 13 Oct 2006 23:38:19 GMT
Author: peterreilly
Date: Fri Oct 13 16:38:19 2006
New Revision: 463867

URL: http://svn.apache.org/viewvc?view=rev&rev=463867
Log:
allow . /etc/ant.conf if ant_home is /usr/share/ant

Modified:
    ant/core/trunk/src/script/ant

Modified: ant/core/trunk/src/script/ant
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/script/ant?view=diff&rev=463867&r1=463866&r2=463867
==============================================================================
--- ant/core/trunk/src/script/ant (original)
+++ ant/core/trunk/src/script/ant Fri Oct 13 16:38:19 2006
@@ -45,8 +45,10 @@
   usejikes=$use_jikes_default
 else
   # load system-wide ant configuration (ONLY if ANT_HOME has NOT been set)
-  if [ -z "$ANT_HOME" -a -f "/etc/ant.conf" ] ; then
-    . /etc/ant.conf
+  if [ -z "$ANT_HOME" -o "$ANT_HOME" = "/usr/share/ant" ]; then
+      if [ -f "/etc/ant.conf" ] ; then
+          . /etc/ant.conf
+      fi
   fi
 
   # load user ant configuration



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org


Mime
View raw message