summaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
authorXerxes Rånby <[email protected]>2015-08-12 12:21:12 +0200
committerXerxes Rånby <[email protected]>2015-08-12 12:21:12 +0200
commit3f73bbbd44721cc666e4d3505fcf163490636ba8 (patch)
tree8d11926db3cd2a12c827f6f71644335756fdf8a3 /make
parent961e021ea528aea89129cab4289df4406b24e8b1 (diff)
Bug 1172: Use the same in-jar folder structure for native jars as the fat-jar
Diffstat (limited to 'make')
-rwxr-xr-xmake/gluegen-cpptasks-base.xml4
1 files changed, 3 insertions, 1 deletions
diff --git a/make/gluegen-cpptasks-base.xml b/make/gluegen-cpptasks-base.xml
index 1106241..01d6146 100755
--- a/make/gluegen-cpptasks-base.xml
+++ b/make/gluegen-cpptasks-base.xml
@@ -1655,7 +1655,9 @@
<mkdir dir="${nativejarfile.tmpdir}/java" />
<mkdir dir="${nativejarfile.tmpdir.natives}" />
- <copy todir="${nativejarfile.tmpdir.natives}">
+ <mkdir dir="${nativejarfile.tmpdir.natives}/natives" />
+ <mkdir dir="${nativejarfile.tmpdir.natives}/natives/${os.and.arch}" />
+ <copy todir="${nativejarfile.tmpdir.natives}/natives/${os.and.arch}">
<fileset dir="@{objdir}"
includes="@{includelibs}"
excludes="@{excludelibs}"/>