--- ./catalina/build.xml.orig	Mon Apr  2 18:55:59 2001
+++ ./catalina/build.xml	Mon Apr  2 19:19:59 2001
@@ -13,13 +13,17 @@
   <!-- ================== Derived Property Values ========================= -->
   <property name="jaxp.jar"        value="${catalina.jaxp.home}/jaxp.jar"/>
   <property name="parser.jar"      value="${catalina.jaxp.home}/${catalina.jaxp.parser.jar}"/>
-  <property name="jcert.jar"       value="${jsse.home}/lib/jcert.jar"/>
-  <property name="jndi.jar"        value="${jndi.home}/lib/jndi.jar"/>
-  <property name="jnet.jar"        value="${jsse.home}/lib/jnet.jar"/>
-  <property name="jsse.jar"        value="${jsse.home}/lib/jsse.jar"/>
-  <property name="jmxri.jar"       value="${jmx.home}/lib/jmxri.jar"/>
+  <property name="jsse.lib"        value="${jsse.home}/lib/"/>
+  <property name="jmx.lib"         value="${jmx.home}/lib/"/>
+  <property name="jndi.lib"        value="${jndi.home}/lib/"/>
+  <property name="servlet.lib"     value="${servletapi.home}/lib/"/>
+  <property name="jcert.jar"       value="${jsse.lib}/jcert.jar"/>
+  <property name="jndi.jar"        value="${jndi.lib}/jndi.jar"/>
+  <property name="jnet.jar"        value="${jsse.lib}/jnet.jar"/>
+  <property name="jsse.jar"        value="${jsse.lib}/jsse.jar"/>
+  <property name="jmxri.jar"       value="${jmx.lib}/jmxri.jar"/>
   <property name="regexp.jar"      value="${regexp.home}/jakarta-regexp-1.2.jar"/>
-  <property name="servlet.jar"     value="${servletapi.home}/lib/servlet.jar"/>
+  <property name="servlet.jar"     value="${servletapi.lib}/servlet.jar"/>
 
   <!-- =================== BUILD: Create Directories ====================== -->
   <target name="build-prepare">
@@ -69,9 +73,7 @@
     <copy file="${parser.jar}" 
      tofile="${catalina.build}/server/lib/${catalina.jaxp.parser.jar}" />
     <!--   Catalina needs the regular expression library -->
-    <copy todir="${catalina.build}/server/lib">
-      <fileset dir="${regexp.home}" includes="*.jar"/>
-    </copy>
+    <copy file="${regexp.jar}" tofile="${catalina.build}/server/lib/regexp.jar"/>
     <!--   Catalina needs the JSSE packages -->
 <!--
     <copy file="${jcert.jar}" tofile="${catalina.build}/server/lib/jcert.jar"/>