--- apache-ant-1.7.1/src/script/ant.orig	2008-06-27 01:05:19.000000000 -0400
+++ apache-ant-1.7.1/src/script/ant	2010-09-14 11:58:45.294514063 -0400
@@ -45,18 +45,18 @@
   usejikes=$use_jikes_default
 else
   # load system-wide ant configuration (ONLY if ANT_HOME has NOT been set)
-  if [ -z "$ANT_HOME" -o "$ANT_HOME" = "/usr/share/ant" ]; then
-      if [ -f "/etc/ant.conf" ] ; then
-          . /etc/ant.conf
+  if [ -z "$ANT_HOME" -o "$ANT_HOME" = "/usr/share/ant17" ]; then
+      if [ -f "/etc/ant17.conf" ] ; then
+          . /etc/ant17.conf
       fi
   fi
 
   # load user ant configuration
-  if [ -f "$HOME/.ant/ant.conf" ] ; then
-    . $HOME/.ant/ant.conf
+  if [ -f "$HOME/.ant17/ant.conf" ] ; then
+    . $HOME/.ant17/ant.conf
   fi
-  if [ -f "$HOME/.antrc" ] ; then
-    . "$HOME/.antrc"
+  if [ -f "$HOME/.ant17rc" ] ; then
+    . "$HOME/.ant17rc"
   fi
 
   # provide default configuration values
@@ -154,11 +154,11 @@
 # request optional jars and their dependencies via the OPT_JAR_LIST
 # variable
 if $rpm_mode && [ -x /usr/bin/build-classpath ] ; then
-  LOCALCLASSPATH="$(/usr/bin/build-classpath ant ant-launcher jaxp_parser_impl xml-commons-apis)"
+  LOCALCLASSPATH="$(/usr/bin/build-classpath ant17 ant17-launcher jaxp_parser_impl xml-commons-apis)"
 
   # If no optional jars have been specified then build the default list
   if [ -z "$OPT_JAR_LIST" ] ; then
-    for file in /etc/ant.d/*; do
+    for file in /etc/ant17.d/*; do
       if [ -f "$file" ]; then
         case "$file" in
         *~) ;;
@@ -216,9 +216,9 @@
 else
   # not using rpm_mode; use launcher to determine classpaths
   if [ -z "$LOCALCLASSPATH" ] ; then
-      LOCALCLASSPATH=$ANT_LIB/ant-launcher.jar
+      LOCALCLASSPATH=$ANT_LIB/ant17-launcher.jar
   else
-      LOCALCLASSPATH=$ANT_LIB/ant-launcher.jar:$LOCALCLASSPATH
+      LOCALCLASSPATH=$ANT_LIB/ant17-launcher.jar:$LOCALCLASSPATH
   fi
 fi
 
@@ -268,8 +268,8 @@
   echo $0 '[script options] [options] [target [target2 [target3] ..]]'
   echo 'Script Options:'
   echo '  --help, --h            print this message and ant help'
-  echo '  --noconfig             suppress sourcing of /etc/ant.conf,'
-  echo '                         $HOME/.ant/ant.conf, and $HOME/.antrc'
+  echo '  --noconfig             suppress sourcing of /etc/ant17.conf,'
+  echo '                         $HOME/.ant17/ant.conf, and $HOME/.ant17rc'
   echo '                         configuration files'
   echo '  --usejikes             enable use of jikes by default, unless'
   echo '                         set explicitly in configuration files'