From 3f73bbbd44721cc666e4d3505fcf163490636ba8 Mon Sep 17 00:00:00 2001
From: Xerxes Rånby <xerxes@gudinna.com>
Date: Wed, 12 Aug 2015 12:21:12 +0200
Subject: Bug 1172: Use the same in-jar folder structure for native jars as the
 fat-jar

---
 make/gluegen-cpptasks-base.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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}"/>
-- 
cgit v1.2.3