Index: /release-kits/wirk3/ant-scripts/compile.xml
===================================================================
--- /release-kits/wirk3/ant-scripts/compile.xml	(revision 19660)
+++ /release-kits/wirk3/ant-scripts/compile.xml	(revision 19661)
@@ -4,5 +4,5 @@
 	<target name="compile">
 		<antcall target="checkout-greenstone3" />
-		<antcall target="generate-build-properties"/>
+		<antcall target="generate-build-properties"><param name="greenstone3.basedir" value="compiled"/></antcall>
 		
 		<antcall target="greenstone3-set-version-numbers"><param name="greenstone3basedir" value="${basedir}/compiled" /></antcall>
@@ -28,11 +28,4 @@
 	</target>
 
-	<target name="generate-build-properties">
-		<copy file="compiled/build.properties.in" tofile="compiled/build.properties"/>
-		<if><bool><istrue value="${install.flax}"/></bool>
-			<rsr file="compiled/build.properties" pattern="^#install.flax\s*[=:].*" replacement="install.flax=true"/>
-		</if>
-	</target>
-
 	<target name="tweak-configure-scripts">
 		<antcall target="mgpp-add-static" />
@@ -47,4 +40,6 @@
 			<checkout url="${svn.root}/documentation/${branch.path}/shared" destPath="compiled/gsdl-manuals/shared" revision="${branch.revision}"/>
 		</svn>
+		<javac srcdir="compiled/gsdl-manuals/shared" destdir="compiled/gsdl-manuals/shared" debug="on"><include name="*.java"/></javac>
+		<unzip src="compiled/gsdl-manuals/shared/fop.zip" dest="compiled/gsdl-manuals/shared"/>
 
 		<echo>Define Classpath</echo>
@@ -57,7 +52,4 @@
 			<pathelement path="compiled/gli/classes"/>
 		</path>
-
-		<javac classpathref="documentation.compile.classpath" srcdir="compiled/gsdl-manuals/shared" destdir="compiled/gsdl-manuals/shared" debug="on"><include name="*.java"/></javac>
-		<unzip src="compiled/gsdl-manuals/shared/fop.zip" dest="compiled/gsdl-manuals/shared"/>
 					
 		<echo>Apply XSLT</echo>
Index: /release-kits/wirk3/ant-scripts/create-distribution.xml
===================================================================
--- /release-kits/wirk3/ant-scripts/create-distribution.xml	(revision 19660)
+++ /release-kits/wirk3/ant-scripts/create-distribution.xml	(revision 19661)
@@ -6,12 +6,10 @@
 		<!-- create distribution -->
 		<antcall target="export-greenstone3-gli" />
+		<antcall target="generate-build-properties"><param name="greenstone3.basedir" value="distributions/web"/></antcall>
 		<antcall target="greenstone3-set-version-numbers"><param name="greenstone3basedir" value="${basedir}/distributions/web" /></antcall>
 		<antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/distributions/web/gli" /></antcall>
 		<antcall target="insert-user-manual"/>
-		<antcall target="insert-uninstaller"><param name="script-format" value="bat"/></antcall> <!-- from init -->
-		<antcall target="insert-uninstaller-jar"/> <!-- from rk3-targets -->
+		<antcall target="insert-uninstaller"><param name="script-format" value="bat"/></antcall> <!-- from rk3-targets -->
 
-		<ant target="configure-java-version" antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distributions/web" inheritAll="false"/>
-			
 		<ant target="create-distribution-1" antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distributions/web" inheritAll="false">
 			<property name="app.version" value="${version}"/>
Index: /release-kits/wirk3/ant-scripts/operations-on-gs3home.xml
===================================================================
--- /release-kits/wirk3/ant-scripts/operations-on-gs3home.xml	(revision 19660)
+++ /release-kits/wirk3/ant-scripts/operations-on-gs3home.xml	(revision 19661)
@@ -10,9 +10,4 @@
 
 <project name="opeations-on-gs3home" default="usage">
-
-	<path id="runtime.classpath">
-		<fileset dir="${web.lib}" includes="**/*.jar"/>
-	</path>
-
   
 	<!-- include standard build file -->
@@ -32,4 +27,5 @@
 		<antcall target="unzip-windows-packages"/>
 		<antcall target="checkout-winbin"/>
+		<antcall target="prepare-flax"/>
 		<!--<antcall target="get-perl-for-windows"/>-->
 	</target>
@@ -53,4 +49,5 @@
 		<antcall target="prepare-tomcat"/>
 		<antcall target="prepare-axis"/>
+		<antcall target="prepare-flax"/>
 
 		
@@ -93,14 +90,12 @@
 
 		<!-- put gs2build source code in a tidy place -->
-		<if><bool><available file="${gs2build.home}/source/src"/></bool>
-			<move todir="${gs2build.home}/source/src" failonerror="false"><fileset dir="${gs2build.home}/src" defaultexcludes="no"/></move>
-			<move todir="${gs2build.home}/source/lib" failonerror="false"><fileset dir="${gs2build.home}/lib" defaultexcludes="no"/></move>
-			<move todir="${gs2build.home}/source/packages" failonerror="false"><fileset dir="${gs2build.home}/packages" defaultexcludes="no"/></move>
-			<move todir="${gs2build.home}/source/indexers" failonerror="false"><fileset dir="${gs2build.home}/indexers" defaultexcludes="no"/></move>
-			<move file="${gs2build.home}/win32.mak" tofile="${gs2build.home}/source/win32.mak"/>
-			<!--<move file="${gs2build.home}/setup.bat" tofile="${gs2build.home}/source/setup.bat"/>-->
-			<!--<move file="${gs2build.home}/win32cfg.h" tofile="${gs2build.home}/source/win32cfg.h"/>-->
-		</if>
-		
+		<move todir="${gs2build.home}/source/src" failonerror="false"><fileset dir="${gs2build.home}/src" defaultexcludes="no"/></move>
+		<move todir="${gs2build.home}/source/lib" failonerror="false"><fileset dir="${gs2build.home}/lib" defaultexcludes="no"/></move>
+		<move todir="${gs2build.home}/source/packages" failonerror="false"><fileset dir="${gs2build.home}/packages" defaultexcludes="no"/></move>
+		<move todir="${gs2build.home}/source/indexers" failonerror="false"><fileset dir="${gs2build.home}/indexers" defaultexcludes="no"/></move>
+		<move file="${gs2build.home}/win32.mak" tofile="${gs2build.home}/source/win32.mak"/>
+		<!--<move file="${gs2build.home}/setup.bat" tofile="${gs2build.home}/source/setup.bat"/>-->
+		<!--<move file="${gs2build.home}/win32cfg.h" tofile="${gs2build.home}/source/win32cfg.h"/>-->
+
 		<!-- clean up -->
 		<delete includeemptydirs="true">
@@ -146,9 +141,9 @@
 
 	<target name="run-xslt-source" depends="init">
-		<xslt classpathref="runtime.classpath" in="${basedir}/build.xml" out="${basedir}/dist-build.xml" style="${basedir}/dist-resources/convert-build-xml-source.xsl"/>
+		<xslt in="${basedir}/build.xml" out="${basedir}/dist-build.xml" style="${basedir}/dist-resources/convert-build-xml-source.xsl"/>
 	</target>
   
 	<target name="run-xslt-binary" depends="init">
-		<xslt classpathref="runtime.classpath" in="${basedir}/build.xml" out="${basedir}/modified-build.xml" style="${wirk3.home}/greenstone3/xsl/convert-build-xml.xsl"/>
+		<xslt in="${basedir}/build.xml" out="${basedir}/modified-build.xml" style="${wirk3.home}/greenstone3/xsl/convert-build-xml.xsl"/>
 	</target>
 
