fix _dirdir in caseof arm64

- /usr/lib for arm32
- /usr/lib64 for arm64

Change-Id: I2d510756c98a06b799fbebe8280c08cc1bed4eb2

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cf93c0d..d972511 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,7 @@ PROJECT(${fw_name})
 
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(EXEC_PREFIX "\${prefix}")
-SET(LIBDIR "\${exec_prefix}/lib")
+SET(LIBDIR "${CMAKE_LIBDIR}")
 #SET(INCLUDEDIR "\${prefix}/include/vconf")
 SET(INCLUDEDIR "/usr/include/vconf")
 
@@ -49,9 +49,9 @@ SET(PC_REQUIRED ${pc_requires})
 SET(PC_LDFLAGS -l${fw_name})
 SET(PC_CFLAGS -I\${includedir}/system)
 
-#CONFIGURE_FILE(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc @ONLY)
-#SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${PROJECT_NAME}.pc")
-#INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION lib/pkgconfig)
+CONFIGURE_FILE(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc @ONLY)
+SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${PROJECT_NAME}.pc")
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION ${LIBDIR}/pkgconfig)
 
 #INSTALL(TARGETS ${fw_name} DESTINATION lib)
 INSTALL(

diff --git a/packaging/vconf-internal-keys.spec b/packaging/vconf-internal-keys.spec
index 0f2ec99..7aec62f 100755 (executable)
--- a/packaging/vconf-internal-keys.spec
+++ b/packaging/vconf-internal-keys.spec
@@ -32,7 +32,7 @@ Vconf internal key header files (devel)
 %build
 
 MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
-cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
+cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DFULLVER=%{version} -DMAJORVER=${MAJORVER} -DCMAKE_LIBDIR=%{_libdir}
 
 make %{?jobs:-j%jobs}
 
@@ -69,6 +69,6 @@ done
 %files devel
 %defattr(-,root,root,-)
 /usr/include/vconf/*.h
-#%{_libdir}/pkgconfig/*.pc
+%{_libdir}/pkgconfig/*.pc
 #%{_libdir}/lib*.so