fixed for 64bit

Signed-off-by: jomui <jongmun.woo@samsung.com>
Change-Id: I6a99093d4caf6326ad8b41db2f87070c596870e4

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 448761e..87d331a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -106,9 +106,9 @@ CONFIGURE_FILE(
 )
 
 # Install
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}.pc DESTINATION lib/pkgconfig)
-INSTALL(TARGETS ${fw_name} DESTINATION lib/maps/plugins)
-INSTALL(FILES ${TANGRAM_LIBRARY} DESTINATION lib)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}.pc DESTINATION ${LIBDIR}/pkgconfig)
+INSTALL(TARGETS ${fw_name} DESTINATION ${LIBDIR}/maps/plugins)
+INSTALL(FILES ${TANGRAM_LIBRARY} DESTINATION ${LIBDIR})
 
 #INCLUDE(FindPkgConfig)
 #pkg_check_modules(lib_pkgs REQUIRED

diff --git a/packaging/maps-plugin-mapzen.spec b/packaging/maps-plugin-mapzen.spec
index 7ddfaff..42d27af 100644 (file)
--- a/packaging/maps-plugin-mapzen.spec
+++ b/packaging/maps-plugin-mapzen.spec
@@ -53,7 +53,7 @@ This package provides Plugin APIs for Mapzen.
 %build
 
 MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
-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}
 make %{?jobs:-j%jobs}
 
 %install
@@ -75,9 +75,9 @@ cp -r scenes/* %{buildroot}/usr/share/maps/mapzen/scenes/
 %files
 %manifest maps-plugin-mapzen.manifest
 %defattr(-,root,root,-)
-%{_prefix}/lib/maps/plugins/libmaps-plugin-mapzen.so*
-%{_prefix}/lib/libtangram.so*
-%{_prefix}/lib/pkgconfig/maps-plugin-mapzen.pc
+%{_libdir}/maps/plugins/libmaps-plugin-mapzen.so*
+%{_libdir}/libtangram.so*
+%{_libdir}/pkgconfig/maps-plugin-mapzen.pc
 /usr/share/license/maps-plugin-mapzen
 %{_prefix}/share/maps/mapzen/scenes/*
 
@@ -98,5 +98,5 @@ This package provides Plugin APIs for Mapzen. (Development)
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/mapzen-plugin/*.h
-%{_prefix}/lib/pkgconfig/maps-plugin-mapzen.pc
-%{_prefix}/lib/maps/plugins/libmaps-plugin-mapzen.so
+%{_libdir}/pkgconfig/maps-plugin-mapzen.pc
+%{_libdir}/maps/plugins/libmaps-plugin-mapzen.so