- updated for 1.6.3

[packages/ant.git] / jakarta-ant-ANT_HOME.patch

diff --git a/jakarta-ant-ANT_HOME.patch b/jakarta-ant-ANT_HOME.patch
index 1d41720e96a23b39c477437b1ff80c08cf26045f..834f5971ec891fb8a00286848d55e6b77dfafbc4 100644 (file)
--- a/jakarta-ant-ANT_HOME.patch
+++ b/jakarta-ant-ANT_HOME.patch
@@ -1,29 +1,19 @@
---- jakarta-ant-1.4.1/src/script/ant.wiget     Thu Oct 11 15:58:30 2001
-+++ jakarta-ant-1.4.1/src/script/ant   Thu Mar 21 15:02:29 2002
-@@ -14,13 +14,13 @@
+--- apache-ant-1.6.3/src/script/ant.orig       2005-04-28 15:43:12.000000000 +0200
++++ apache-ant-1.6.3/src/script/ant    2005-05-07 11:48:33.504821320 +0200
+@@ -87,6 +87,9 @@
+ esac
  
- if [ -z "$ANT_HOME" ] ; then
-   # try to find ANT
--  if [ -d /opt/ant ] ; then 
-+  if [ -f /usr/share/java/ant.jar ] ; then 
+ if [ -z "$ANT_HOME" -o ! -d "$ANT_HOME" ] ; then
++  if [ -f /usr/share/java/ant.jar ]; then
 +    ANT_HOME=/usr/share/java
-+  elif [ -d /opt/ant ] ; then 
-     ANT_HOME=/opt/ant
--  fi
--
--  if [ -d ${HOME}/opt/ant ] ; then 
-+  elif [ -d ${HOME}/opt/ant ] ; then 
-     ANT_HOME=${HOME}/opt/ant
--  fi
-+  else        
- 
++  else
    ## resolve links - $0 may be a link to ant's home
-   PRG=$0
-@@ -37,7 +37,7 @@
-   done
-   
-   ANT_HOME=`dirname "$PRG"`/..
--
+   PRG="$0"
+   progname=`basename "$0"`
+@@ -106,6 +109,7 @@
+ 
+   # make it fully qualified
+   ANT_HOME=`cd "$ANT_HOME" && pwd`
 +  fi
  fi