@@ -18,7 +18,7 @@ fi
# load user ant configuration
# load user ant configuration
if [ -f "$HOME/.antrc" ] ; then
if [ -f "$HOME/.antrc" ] ; then
. $HOME/.antrc
. " $HOME/.antrc"
fi
fi
# OS specific support. $var _must_ be set to either true or false.
# OS specific support. $var _must_ be set to either true or false.
@@ -103,7 +103,7 @@ fi
# in rpm_mode get ant/optional/xml parser&api from JAVALIBDIR
# in rpm_mode get ant/optional/xml parser&api from JAVALIBDIR
if $rpm_mode; then
if $rpm_mode; then
JAVALIBDIR=" /usr/share/java"
JAVALIBDIR=/usr/share/java
for i in ant ant-optional jaxp_parser xml_apis
for i in ant ant-optional jaxp_parser xml_apis
do
do
if [ -z "$LOCALCLASSPATH" ] ; then
if [ -z "$LOCALCLASSPATH" ] ; then
@@ -113,9 +113,8 @@ if $rpm_mode; then
fi
fi
done
done
# in rpm mode ant/lib is in /usr/share/java/ant
ANT_LIB="${JAVALIBDIR}/ant"
# in rpm mode ant/lib is in /usr/share/java/ant
ANT_LIB="${JAVALIBDIR}/ant"
fi
fi
# add in the dependency .jar files in non-RPM mode (the default)
# add in the dependency .jar files in non-RPM mode (the default)