From cae601c6fd11ff8b2e32ee38d28b050a1d407b06 Mon Sep 17 00:00:00 2001
From: Qing <lanking520@live.com>
Date: Fri, 14 Dec 2018 15:06:24 -0800
Subject: [PATCH] add build fix for Scala/Java build

---
 scala-package/.gitignore                     | 2 ++
 scala-package/init-native/osx-x86_64/pom.xml | 2 +-
 scala-package/native/osx-x86_64-cpu/pom.xml  | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/scala-package/.gitignore b/scala-package/.gitignore
index 8bc87f53e802..9a89bef324bc 100644
--- a/scala-package/.gitignore
+++ b/scala-package/.gitignore
@@ -4,6 +4,8 @@ core/src/main/scala/org/apache/mxnet/NDArrayBase.scala
 core/src/main/scala/org/apache/mxnet/javaapi/NDArrayBase.scala
 core/src/main/scala/org/apache/mxnet/SymbolAPIBase.scala
 core/src/main/scala/org/apache/mxnet/SymbolBase.scala
+core/src/main/scala/org/apache/mxnet/NDArrayRandomAPIBase.scala
+core/src/main/scala/org/apache/mxnet/SymbolRandomAPIBase.scala
 examples/scripts/infer/images/
 examples/scripts/infer/models/
 local-snapshot
\ No newline at end of file
diff --git a/scala-package/init-native/osx-x86_64/pom.xml b/scala-package/init-native/osx-x86_64/pom.xml
index 12f4d800eba4..1c3966f477e6 100644
--- a/scala-package/init-native/osx-x86_64/pom.xml
+++ b/scala-package/init-native/osx-x86_64/pom.xml
@@ -121,7 +121,7 @@
             </goals>
             <configuration>
               <executable>install_name_tool</executable>
-              <commandlineArgs>-change lib/libmxnet.so @loader_path/libmxnet.so ${project.build.directory}/${artifactId}.jnilib</commandlineArgs>
+              <commandlineArgs>-change @rpath/libmxnet.so @loader_path/libmxnet.so ${project.build.directory}/${artifactId}.jnilib</commandlineArgs>
             </configuration>
           </execution>
           <execution>
diff --git a/scala-package/native/osx-x86_64-cpu/pom.xml b/scala-package/native/osx-x86_64-cpu/pom.xml
index 425ca96815de..f6f90cdcdb58 100644
--- a/scala-package/native/osx-x86_64-cpu/pom.xml
+++ b/scala-package/native/osx-x86_64-cpu/pom.xml
@@ -121,7 +121,7 @@
             </goals>
             <configuration>
               <executable>install_name_tool</executable>
-              <commandlineArgs>-change lib/libmxnet.so @loader_path/libmxnet.so ${project.build.directory}/${artifactId}.jnilib</commandlineArgs>
+              <commandlineArgs>-change @rpath/libmxnet.so @loader_path/libmxnet.so ${project.build.directory}/${artifactId}.jnilib</commandlineArgs>
             </configuration>
           </execution>
           <execution>