Submitted By:            Randy McMurchy <randy_at_linuxfromscratch_dot_org>
Date:                    2005-08-19
Initial Package Version: 1.6.5 (modified version of the 1.6.2 patch - more than a rediff)
Upstream Status:         Not submitted (LFS/FHS specific)
Origin:                  Randy McMurchy
Description:             Modifies the installation layout to conform with 
                         LFS and FHS Guidelines

$LastChangedBy: randy $
$Date: 2005-08-19 15:59:19 -0500 (Fri, 19 Aug 2005) $


diff -Naur apache-ant-1.6.5-orig/build.xml apache-ant-1.6.5/build.xml
--- apache-ant-1.6.5-orig/build.xml	2005-06-02 13:19:54.000000000 +0000
+++ apache-ant-1.6.5/build.xml	2005-08-19 18:55:55.000000000 +0000
@@ -125,7 +125,8 @@
   <property name="dist.bin" value="${dist.dir}/bin"/>
   <property name="dist.lib" value="${dist.dir}/lib"/>
   <property name="dist.docs" value="${dist.dir}/docs"/>
-  <property name="dist.etc" value="${dist.dir}/etc"/>
+  <property name="dist.readme" value="${dist.dir}/docs/readme"/>
+  <property name="dist.etc" value="/etc/ant"/>
   <property name="dist.javadocs" value="${dist.dir}/docs/manual/api"/>
 
   <property name="src.dist.dir" value="dist-src"/>
@@ -902,6 +903,7 @@
     <mkdir dir="${dist.dir}"/>
     <mkdir dir="${dist.bin}"/>
     <mkdir dir="${dist.lib}"/>
+    <mkdir dir="${dist.readme}"/>
 
     <copy todir="${dist.lib}">
       <fileset dir="${build.lib}">
@@ -980,7 +982,7 @@
       </fileset>
     </copy>
 
-    <copy todir="${dist.dir}">
+    <copy todir="${dist.readme}">
       <fileset dir=".">
         <include name="README"/>
         <include name="INSTALL"/>

diff -Naur apache-ant-1.6.5-orig/src/script/ant apache-ant-1.6.5/src/script/ant
--- apache-ant-1.6.5-orig/src/script/ant	2005-06-02 13:19:04.000000000 +0000
+++ apache-ant-1.6.5/src/script/ant	2005-08-19 18:55:55.000000000 +0000
@@ -44,8 +44,8 @@
   usejikes=$use_jikes_default
 else
   # load system-wide ant configuration
-  if [ -f "/etc/ant.conf" ] ; then
-    . /etc/ant.conf
+  if [ -f "/etc/ant/ant.conf" ] ; then
+    . /etc/ant/ant.conf
   fi
 
   # load user ant configuration
@@ -241,7 +241,7 @@
   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 '  --noconfig             suppress sourcing of /etc/ant/ant.conf,'
   echo '                         $HOME/.ant/ant.conf, and $HOME/.antrc'
   echo '                         configuration files'
   echo '  --usejikes             enable use of jikes by default, unless'