Support /usr/lib64 path for aarch64 build

Change-Id: I8043fa80573893a68ac6704adb0afcea28797e5b
Signed-off-by: kj7.sung <kj7.sung@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 861afa1..af2ad33 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,6 @@ PROJECT(${pkg_name} C CXX)
 
 SET(CMAKE_INSTALL_PREFIX /usr)
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
-SET(LIBDIR ${LIBDIR})
 
 # Dependencies
 SET(dependents
@@ -34,9 +33,6 @@ FOREACH(flag ${pkgs_CFLAGS})
 ENDFOREACH(flag)
 
 # Build
-SET(CMAKE_INSTALL_PREFIX /usr)
-SET(PREFIX ${CMAKE_INSTALL_PREFIX})
-
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fvisibility=hidden -fPIC -Wall -Werror")
 SET(CMAKE_C_FLAGS_DEBUG "-O0 -g")
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CFLAGS} -Wall -fPIC -std=c++0x -fvisibility=hidden")
@@ -101,7 +97,7 @@ TARGET_LINK_LIBRARIES(${pkg_name} ${HERE_ENGINE} ${pkgs_LDFLAGS})
 
 # Install
 INSTALL(TARGETS ${pkg_name} DESTINATION ${LIBDIR}/maps/plugins)
-INSTALL(FILES lib/${ARCH}/libheremaps-engine.so DESTINATION lib)
+INSTALL(FILES lib/${ARCH}/libheremaps-engine.so DESTINATION ${LIBDIR})
 
 # Test Suite
 #IF("${BINTYPE}" STREQUAL "eng")

diff --git a/maps-plugin-here.pc.in b/maps-plugin-here.pc.in
index 599cd78..db397a5 100644 (file)
--- a/maps-plugin-here.pc.in
+++ b/maps-plugin-here.pc.in
@@ -1,8 +1,7 @@
 #Package Information for pkg-config
 
 prefix=@PREFIX@
-exec_prefix=/usr
-libdir=/usr/lib
+libdir=@LIBDIR@
 includedir=@PC_INCLUDE@
 
 Name: @PC_NAME@

diff --git a/packaging/maps-plugin-here.spec b/packaging/maps-plugin-here.spec
index 2fa38bb..9ff7cf6 100644 (file)
--- a/packaging/maps-plugin-here.spec
+++ b/packaging/maps-plugin-here.spec
@@ -70,9 +70,9 @@ This package provides Plugin APIs capsulating HERE Maps Engine Library for Maps
 
 MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
 %if "%{profile}" == "wearable"
-cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DMAJORVER=${MAJORVER} -DFULLVER=%{version} -DLIBDIR=lib -DARCH=%{ARCH} -DSYSCONF_DIR=%{_sysconfdir} -DTIZEN_WEARABLE=YES
+cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DMAJORVER=${MAJORVER} -DFULLVER=%{version} -DLIBDIR=%{_libdir} -DARCH=%{ARCH} -DSYSCONF_DIR=%{_sysconfdir} -DTIZEN_WEARABLE=YES
 %else
-cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DMAJORVER=${MAJORVER} -DFULLVER=%{version} -DLIBDIR=lib -DARCH=%{ARCH} -DSYSCONF_DIR=%{_sysconfdir}
+cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DMAJORVER=${MAJORVER} -DFULLVER=%{version} -DLIBDIR=%{_libdir} -DARCH=%{ARCH} -DSYSCONF_DIR=%{_sysconfdir}
 %endif
 make %{?jobs:-j%jobs}
 
@@ -82,7 +82,7 @@ rm -rf %{buildroot}
 
 mkdir -p %{buildroot}/usr/share/license
 cp LICENSE %{buildroot}/usr/share/license/%{name}
-cp -a lib/%{ARCH}/libheremaps-engine.so* %{buildroot}%{_prefix}/lib/
+cp -a lib/%{ARCH}/libheremaps-engine.so* %{buildroot}%{_libdir}/
 
 %post
 /sbin/ldconfig
@@ -93,8 +93,8 @@ cp -a lib/%{ARCH}/libheremaps-engine.so* %{buildroot}%{_prefix}/lib/
 %files
 %manifest maps-plugin-here.manifest
 %defattr(-,root,root,-)
-%{_prefix}/lib/maps/plugins/libmaps-plugin-here.so*
-%{_prefix}/lib/libheremaps-engine.so*
+%{_libdir}/maps/plugins/libmaps-plugin-here.so*
+%{_libdir}/libheremaps-engine.so*
 /usr/share/license/maps-plugin-here