--- build.xml.orig	Fri May 13 11:38:39 2005
+++ build.xml	Sat May 14 23:42:22 2005
@@ -53,7 +53,7 @@
 		<exec dir="${swtlibs}/" executable="sh" failonerror="true">
 			<arg line="build.sh"/>
 		</exec>
-		<property name="swtdir" value="${buildDirectory}/plugins/org.eclipse.swt.${installWs}.{installOs}.{installArch}"/>
+		<property name="swtdir" value="${buildDirectory}/plugins/org.eclipse.swt.${installWs}.${installOs}.${installArch}"/>
 		<mkdir dir="${swtdir}"/>
 		<move todir="${swtdir}/">
 			<fileset dir="${swtlibs}">
@@ -63,12 +63,12 @@
 		<!--unzip launcher -->
 		<property name="launcherlibs" value="${buildDirectory}/launchertmp"/>
 		<mkdir dir="${launcherlibs}"/>
-		<unzip dest="${launcherlibs}">
-			<fileset dir="${buildDirectory}/plugins/org.eclipse.platform.source/src/">
-				<include name ="org.eclipse.platform_*/launchersrc.zip"/>
+		<copy todir="${launcherlibs}">
+			<fileset dir="${buildDirectory}/features/org.eclipse.platform.launchers">
+				<include name ="**"/>
 			</fileset>
-		</unzip>
-		<exec dir="${launcherlibs}/library/${installWs}/" executable="sh" os="Linux" failonerror="true">
+		</copy>
+		<exec dir="${launcherlibs}/library/${installWs}/" executable="sh" os="FreeBSD" failonerror="true">
 			<arg line="build.sh"/>
 		</exec>
 		<move file="${launcherlibs}/library/${installWs}/eclipse" todir="${launcherlibs}/"/>