Fix build macro for 64 bit

Change-Id: I8887ce93c74751e5e0d8de1f2ed014395dfd1a5e
Signed-off-by: Yunjin Lee <yunjin-.lee@samsung.com>

diff --git a/packaging/privilege-info.spec b/packaging/privilege-info.spec
index 01284ce..1e55473 100755 (executable)
--- a/packaging/privilege-info.spec
+++ b/packaging/privilege-info.spec
@@ -54,6 +54,7 @@ echo cmake . -DPREFIX=%{_prefix} \
         -DCMAKE_BUILD_TYPE=%{build_type} \
         -DVERSION=%{version} \
         -DDPL_LOG="ON" \
+        -DDATADIR=%{_datadir} \
         -DPROFILE_TYPE="${__PROFILE_TYPE}"
 
 cmake . -DPREFIX=%{_prefix} \
@@ -63,20 +64,21 @@ cmake . -DPREFIX=%{_prefix} \
         -DCMAKE_BUILD_TYPE=%{build_type} \
         -DVERSION=%{version} \
         -DDPL_LOG="ON" \
+        -DDATADIR=%{_datadir} \
         -DPROFILE_TYPE="${__PROFILE_TYPE}"
 
 make %{?jobs:-j%jobs}
 
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}/usr/share/license
-cp LICENSE.Apache-2.0 %{buildroot}/usr/share/license/privilege-info
+mkdir -p %{buildroot}%{_datadir}/license
+cp LICENSE.Apache-2.0 %{buildroot}%{_datadir}/license/privilege-info
 
 %make_install
 
 %files -n privilege-info
 %{_libdir}/libprivilege-info.so.*
-/usr/share/license/privilege-info
+%{_datadir}/license/privilege-info
 
 %files -n privilege-info-devel
 %{_libdir}/libprivilege-info.so

diff --git a/privilege-info.pc.in b/privilege-info.pc.in
index a771af9..050d8ad 100755 (executable)
--- a/privilege-info.pc.in
+++ b/privilege-info.pc.in
@@ -2,8 +2,8 @@
 
 prefix=@PREFIX@
 exec_prefix=/usr
-libdir=/usr/lib
-includedir=/usr/include
+libdir=@LIBDIR@
+includedir=@INCLUDEDIR@
 
 Name: @PC_NAME@
 Description: @PACKAGE_DESCRIPTION@

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b5b05ab..2956790 100755 (executable)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -38,6 +38,6 @@ TARGET_LINK_LIBRARIES(${TARGET_PRIV_INFO_LIB} ${${PACKAGE_NAME}_LDFLAGS})
 
 #######################################################
 
-INSTALL(TARGETS ${PACKAGE_NAME} DESTINATION /usr/lib)
-INSTALL(FILES ${PROJECT_SOURCE_DIR}/include/privilege_information.h DESTINATION /usr/include)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/privilege-info.pc DESTINATION /usr/lib/pkgconfig)
+INSTALL(TARGETS ${PACKAGE_NAME} DESTINATION ${LIBDIR})
+INSTALL(FILES ${PROJECT_SOURCE_DIR}/include/privilege_information.h DESTINATION ${INCLUDEDIR})
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/privilege-info.pc DESTINATION ${LIBDIR}/pkgconfig)