Index: release-kits/mark2/ant-scripts/compile.xml
===================================================================
--- release-kits/mark2/ant-scripts/compile.xml	(revision 16519)
+++ release-kits/mark2/ant-scripts/compile.xml	(revision 16741)
@@ -5,80 +5,64 @@
 
 		<!-- checkout -->
-		<addressedcall target="checkout-gsdl-gli" />
+		<antcall target="checkout-gsdl-gli" />
 		
 		<!-- configure -->
-		<addressedcall target="run-configure"/>
-		<addressedcall target="tweak-makefiles"/>
+		<antcall target="run-configure"/>
+		<antcall target="tweak-makefiles"/>
 
 		<!-- make -->
-		<addressedcall target="run-make"/>
-		<addressedcall target="run-make-install"/>
-		<addressedcall target="copy-library-oai"/>
-		<addressedcall target="strip-execs"/>
+		<antcall target="run-make"/>
+		<antcall target="run-make-install"/>
+		<antcall target="copy-library-oai"/>
+		<antcall target="strip-execs"/>
 
 		<!-- build collections -->
-		<addressedcall target="build-demo-collection" />
+		<antcall target="build-demo-collection" />
 
 	</target>
 
 	<target name="checkout-gsdl-gli">
-		<if><bool><istrue value="${execute}"/></bool>
-			<svn>
-				<checkout url="${svn.root}/gsdl/${branch.path}" destPath="${basedir}/gsdl"/>
-				<checkout url="${svn.root}/gli/${branch.path}" destPath="${basedir}/gsdl/gli"/>
-			</svn>
-		</if>
+		<svn>
+			<checkout url="${svn.root}/gsdl/${branch.path}" destPath="${basedir}/gsdl"/>
+			<checkout url="${svn.root}/gli/${branch.path}" destPath="${basedir}/gsdl/gli"/>
+		</svn>
 	</target>
 
 	<target name="run-configure">
-		<if><bool><istrue value="${execute}"/></bool>
-			<exec dir="${basedir}/gsdl" executable="${basedir}/gsdl/configure">
-				<arg line="--with-gdbm=${mark2.home}/mac/${processor}/gdbm"/>
-			</exec>
-		</if>
+		<exec dir="${basedir}/gsdl" executable="${basedir}/gsdl/configure">
+			<arg line="--with-gdbm=${mark2.home}/mac/${processor}/gdbm"/>
+		</exec>
 	</target>
 
 	<target name="tweak-makefiles">
-		<if><bool><istrue value="${execute}"/></bool>
-	<rsr file="${basedir}/gsdl/src/recpt/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" />
-	<rsr file="${basedir}/gsdl/src/oaiservr/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" />
-	<rsr file="${basedir}/gsdl/src/gdbmedit/db2txt/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" />
-	<rsr file="${basedir}/gsdl/src/gdbmedit/txt2db/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" />
-	<rsr file="${basedir}/gsdl/src/recpt/Makefile" pattern="^(LIBS =.*)-L(.)\(PACKAGES_DIR\)/expat/lib -lexpat(.*)$" replacement="$1$2(PACKAGES_DIR)/expat/lib/libexpat.a$3" />
-	<rsr file="${basedir}/gsdl/src/oaiservr/Makefile" pattern="^(LIBS =.*)-L(.)\(PACKAGES_DIR\)/expat/lib -lexpat(.*)$" replacement="$1$2(PACKAGES_DIR)/expat/lib/libexpat.a$3" />
-		</if>
+		<rsr file="${basedir}/gsdl/src/recpt/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" />
+		<rsr file="${basedir}/gsdl/src/oaiservr/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" />
+		<rsr file="${basedir}/gsdl/src/gdbmedit/db2txt/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" />
+		<rsr file="${basedir}/gsdl/src/gdbmedit/txt2db/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" />
+		<rsr file="${basedir}/gsdl/src/recpt/Makefile" pattern="^(LIBS =.*)-L(.)\(PACKAGES_DIR\)/expat/lib -lexpat(.*)$" replacement="$1$2(PACKAGES_DIR)/expat/lib/libexpat.a$3" />
+		<rsr file="${basedir}/gsdl/src/oaiservr/Makefile" pattern="^(LIBS =.*)-L(.)\(PACKAGES_DIR\)/expat/lib -lexpat(.*)$" replacement="$1$2(PACKAGES_DIR)/expat/lib/libexpat.a$3" />
 	</target>
 
 	<target name="run-make">
-		<if><bool><istrue value="${execute}"/></bool>
-			<exec dir="${basedir}/gsdl" executable="make"/>
-		</if>
+		<exec dir="${basedir}/gsdl" executable="make"/>
 	</target>
 
 	<target name="run-make-install">
-		<if><bool><istrue value="${execute}"/></bool>
-			<exec dir="${basedir}/gsdl" executable="make"><arg value="install"/></exec>
-		</if>
+		<exec dir="${basedir}/gsdl" executable="make"><arg value="install"/></exec>
 	</target>
 
 	<target name="copy-library-oai">
-		<if><bool><istrue value="${execute}"/></bool>
-			<exec executable="cp"><arg line="${basedir}/gsdl/cgi-bin/library ${basedir}/gsdl/bin/darwin/library"/></exec>
-			<exec executable="cp"><arg line="${basedir}/gsdl/cgi-bin/oaiserver ${basedir}/gsdl/bin/darwin/oaiserver"/></exec>
-		</if>
+		<exec executable="cp"><arg line="${basedir}/gsdl/cgi-bin/library ${basedir}/gsdl/bin/darwin/library"/></exec>
+		<exec executable="cp"><arg line="${basedir}/gsdl/cgi-bin/oaiserver ${basedir}/gsdl/bin/darwin/oaiserver"/></exec>
 	</target>
 
 	<target name="strip-execs">
-		<if><bool><istrue value="${execute}"/></bool>
-			<exec dir="${basedir}/gsdl/bin/darwin" executable="find">
-				<arg line=". ! -name . -type f -maxdepth 1 -exec strip {} &#59;"/>
-			</exec>
-		</if>
+		<exec dir="${basedir}/gsdl/bin/darwin" executable="find">
+			<arg line=". ! -name . -type f -maxdepth 1 -exec strip {} &#59;"/>
+		</exec>
 	</target>
 
 	<target name="build-demo-collection">
-		<if><bool><istrue value="${execute}"/></bool>
-			<exec dir="${basedir}/gsdl" executable="${mark2.home}/resources/build-demo.sh"/>
-		</if>
+		<exec dir="${basedir}/gsdl" executable="${mark2.home}/resources/build-demo.sh"/>
 	</target>
 
