diff options
| author | Peter Reilly <peterreilly@apache.org> | 2006-10-13 23:38:19 +0000 |
|---|---|---|
| committer | Peter Reilly <peterreilly@apache.org> | 2006-10-13 23:38:19 +0000 |
| commit | aded98e62b41a37a4491afc9ec891c42ffc3ef84 (patch) | |
| tree | fddb94623dcadf54a617ee3d593fd40cb6b3a192 /src/script/ant | |
| parent | 875d44b5176806a00d81773b57d0f927a7a59e8e (diff) | |
| download | ant-aded98e62b41a37a4491afc9ec891c42ffc3ef84.tar.gz | |
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
Diffstat (limited to 'src/script/ant')
| -rw-r--r-- | src/script/ant | 6 |
1 files 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 |