| --- a/features/org.eclipse.equinox.executable/target.build.xml.bak 2012-04-18 17:43:40.000000000 +0200 |
| +++ b/features/org.eclipse.equinox.executable/target.build.xml 2012-04-25 10:20:02.136095919 +0200 |
| @@ -188,7 +188,7 @@ |
| <target name="rootFileslinux_gtk_s390x"> |
| <mkdir dir="${feature.base}/linux.gtk.s390x/${collectingFolder}"/> |
| <copy todir="${feature.base}/linux.gtk.s390x/${collectingFolder}" failonerror="true" overwrite="true"> |
| - <fileset dir="${basedir}/contributed/gtk/linux/s390x" includes="**" /> |
| + <fileset dir="${basedir}/bin/gtk/linux/s390x" includes="**" /> |
| <fileset dir="${basedir}/gtk_root" includes="**" /> |
| </copy> |
| <chmod perm="755" dir="${feature.base}/linux.gtk.s390x/${collectingFolder}" includes="launcher" /> |
| @@ -196,7 +196,7 @@ |
| <target name="rootFileslinux_gtk_s390"> |
| <mkdir dir="${feature.base}/linux.gtk.s390/${collectingFolder}"/> |
| <copy todir="${feature.base}/linux.gtk.s390/${collectingFolder}" failonerror="true" overwrite="true"> |
| - <fileset dir="${basedir}/contributed/gtk/linux/s390" includes="**" /> |
| + <fileset dir="${basedir}/bin/gtk/linux/s390" includes="**" /> |
| <fileset dir="${basedir}/gtk_root" includes="**" /> |
| </copy> |
| <chmod perm="755" dir="${feature.base}/linux.gtk.s390/${collectingFolder}" includes="launcher" /> |
| --- a/features/org.eclipse.equinox.executable/library/gtk/build.sh.bak 2012-04-18 17:43:40.000000000 +0200 |
| +++ b/features/org.eclipse.equinox.executable/library/gtk/build.sh 2012-04-25 15:14:23.234010339 +0200 |
| @@ -81,12 +81,12 @@ |
| "s390") |
| defaultOSArch="s390" |
| defaultJava=DEFAULT_JAVA_EXEC |
| - OUTPUT_DIR="../../contributed/$defaultWS/$defaultOS/$defaultOSArch" |
| + OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch" |
| ;; |
| "s390x") |
| defaultOSArch="s390x" |
| defaultJava=DEFAULT_JAVA_EXEC |
| - OUTPUT_DIR="../../contributed/$defaultWS/$defaultOS/$defaultOSArch" |
| + OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch" |
| ;; |
| "ia64") |
| defaultOSArch="ia64" |
