- 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 0dca7a2e3764ec103de9ae07244e32a858390f7e..834f5971ec891fb8a00286848d55e6b77dfafbc4 100644 (file)
--- a/jakarta-ant-ANT_HOME.patch
+++ b/jakarta-ant-ANT_HOME.patch
@@ -1,42 +1,20 @@
-diff -urN jakarta-ant-1.5.1.org/src/script/ant jakarta-ant-1.5.1/src/script/ant
---- jakarta-ant-1.5.1.org/src/script/ant       Wed Nov 27 00:01:16 2002
-+++ jakarta-ant-1.5.1/src/script/ant   Wed Nov 27 00:06:27 2002
-@@ -35,13 +35,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
- 
    ## resolve links - $0 may be a link to ant's home
    PRG="$0"
-@@ -65,6 +65,8 @@
- 
-   cd "$saveddir"
+   progname=`basename "$0"`
+@@ -106,6 +109,7 @@
  
-+  fi
-+
    # make it fully qualified
    ANT_HOME=`cd "$ANT_HOME" && pwd`
++  fi
  fi
-@@ -82,6 +84,10 @@
- # set ANT_LIB location
- ANT_LIB="${ANT_HOME}/lib"
  
-+if [ -z "$JAVA_HOME" -a -x /usr/lib/java/bin/java ]; then
-+  JAVA_HOME=/usr/lib/java
-+fi
-+
- if [ -z "$JAVACMD" ] ; then 
-   if [ -n "$JAVA_HOME"  ] ; then
-     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then 
+ # For Cygwin, ensure paths are in UNIX format before anything is touched