From 3fab5625c7490c8bd2d3433da3b95e652802acd1 Mon Sep 17 00:00:00 2001
From: Andrei Vasiliu <andrei.vasiliu@intel.com>
Date: Mon, 8 Feb 2016 19:16:19 +0200
Subject: [PATCH] java: Updated install path for Java library file

Signed-off-by: Andrei Vasiliu <andrei.vasiliu@intel.com>
Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
---
 src/CMakeLists.txt | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3de28a02..5c0fa850 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -100,12 +100,8 @@ macro(upm_SWIG_JAVA)
       PREFIX "lib"
       SUFFIX ".so"
     )
-    install (FILES ${CMAKE_CURRENT_BINARY_DIR}/libjavaupm_${libname}.so
-        DESTINATION lib/java
-    )
-    install (FILES ${CMAKE_CURRENT_BINARY_DIR}/upm_${libname}.jar
-        DESTINATION lib/java
-    )
+    install (TARGETS javaupm_${libname} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+    install (FILES ${CMAKE_CURRENT_BINARY_DIR}/upm_${libname}.jar DESTINATION ${CMAKE_INSTALL_LIBDIR}/../lib/java)
 
     if (NOT DEFINED $ENV{JAVA_HOME_NATIVE})
         set (JAVAC $ENV{JAVA_HOME}/bin/javac)