Index: lams_common/build.xml
===================================================================
diff -u -rc50bb28b3a077f0c5a3f6d45ff13d4013c086ecf -r018ca38fe0d669447e24067a46d23b2b6ca940d2
--- lams_common/build.xml	(.../build.xml)	(revision c50bb28b3a077f0c5a3f6d45ff13d4013c086ecf)
+++ lams_common/build.xml	(.../build.xml)	(revision 018ca38fe0d669447e24067a46d23b2b6ca940d2)
@@ -4,15 +4,12 @@
 The DOCTYPE declaration declares the location of database-specific parts of the
 Ant build file. 
 -->
-<!DOCTYPE project [
-	<!ENTITY properties SYSTEM "file:./pr{conoperties.xml">
-]>
-
 <project name="LAMS" basedir="." default="usage">
 
 	<!-- import properties from the specified file -->
 	<property file="build.properties"/>
 	<property file="../lams_build/common.properties"/>
+	<property file="../lams_build/${osPropertiesName}.properties" />
 	
 	<path id="all-libs">
 		<fileset dir="${sharedlib}">
@@ -259,7 +256,7 @@
 			<transaction src="${db.scripts}/insert_types_data.sql"/>
 			<transaction src="${db.scripts}/insert_users.sql"/>
 		</sql>
-		<delete dir="${contentrepository.location}"/>
+		<delete dir="${contentrepository.directory}"/>
 	</target>
 
 	<!-- =================================================================== -->