r4515 - trunk

[daigle at ecoinformatics.org]

Author: daigle
Date: 2008-11-05 13:23:44 -0800 (Wed, 05 Nov 2008)
New Revision: 4515

Modified:
   trunk/build.xml
Log:
fix peer.utilites.required variable.  Fix Metacat.pm directory.

Modified: trunk/build.xml
===================================================================
--- trunk/build.xml	2008-11-05 16:49:26 UTC (rev 4514)
+++ trunk/build.xml	2008-11-05 21:23:44 UTC (rev 4515)
@@ -235,7 +235,7 @@
       </condition>
    	  <!-- peer.utilities.required is used when there is no utilities 
    	       directory at ${utilitiesdir} -->
-      <condition property="utilities.required">
+      <condition property="peer.utilities.required">
         <or>
           <not><available file="${utilitiesdir}" type="dir"/></not>
         </or>
@@ -319,7 +319,7 @@
      <echo>Enter CVS password: </echo>
      <cvs cvsRoot="${cvsroot}"
          package="${util-module}"
-         dest="${utilitiesdir}" />
+         dest="${utilitiesdir}/.." />
    </target>
 
    <target name="getutilities" depends="prepare"
@@ -832,7 +832,7 @@
    	
    	   <copy file="src/perl/register-dataset.cgi" todir="${war.context.cgi}"/>
 	   <copy file="src/perl/ldapweb.cgi" todir="${war.context.cgi}" />
-	   <copy file="src/perl/Metacat/blib/lib/Metacat.pm" todir="${war.lib}" />
+	   <copy file="src/perl/Metacat/Metacat.pm" todir="${war.lib}" />
    	
 	   <!-- registry cgi section -->
 	   <!-- TODO SCW: use relative paths to grab these instead of copying to tmp,