Browse Source

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
master
Peter Reilly 18 years ago
parent
commit
aded98e62b
1 changed files with 4 additions and 2 deletions
  1. +4
    -2
      src/script/ant

+ 4
- 2
src/script/ant View File

@@ -45,8 +45,10 @@ if $no_config ; then
usejikes=$use_jikes_default usejikes=$use_jikes_default
else else
# load system-wide ant configuration (ONLY if ANT_HOME has NOT been set) # 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 fi


# load user ant configuration # load user ant configuration


Loading…
Cancel
Save