From aded98e62b41a37a4491afc9ec891c42ffc3ef84 Mon Sep 17 00:00:00 2001
From: Peter Reilly <peterreilly@apache.org>
Date: Fri, 13 Oct 2006 23:38:19 +0000
Subject: [PATCH] allow . /etc/ant.conf if ant_home is /usr/share/ant

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@463867 13f79535-47bb-0310-9956-ffa450edef68
---
 src/script/ant | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/script/ant b/src/script/ant
index df3823c80..bcc63c85a 100644
--- a/src/script/ant
+++ b/src/script/ant
@@ -45,8 +45,10 @@ if $no_config ; then
   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