Use cmake and spac variables instead of hardcoded paths.

Change-Id: I301e82c76b0eb2f49851f5bf0c3b0f59818ba26c

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3d61806..906e345 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@ PROJECT(libprivilege-control C)
 SET(TARGET_PRIVILEGE_CONTROL "privilege-control")
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(EXEC_PREFIX "\${prefix}")
-SET(SHAREDIR "${PREFIX}/share/privilege-control")
+SET(SHAREDIR "${SHARE_INSTALL_PREFIX}/privilege-control")
 SET(HOMEDIR "${TZ_SYS_HOME}")
 SET(VERSION 1.0)
 
@@ -82,10 +82,10 @@ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/privilege-control.h DESTINATIO
 INSTALL(FILES .privilege_control_app_gids.db DESTINATION ${TZ_SYS_DB})
 #INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/udev/ DESTINATION lib/udev)
 
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/db/rules-db.sql DESTINATION /usr/share/privilege-control/db)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/db/rules-db-data.sql DESTINATION /usr/share/privilege-control/db)
-INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/db/updates/ DESTINATION /usr/share/privilege-control/db/updates)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/db/updater.sh DESTINATION /usr/share/privilege-control/db
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/db/rules-db.sql DESTINATION ${SHAREDIR}/db)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/db/rules-db-data.sql DESTINATION ${SHAREDIR}/db)
+INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/db/updates/ DESTINATION ${SHAREDIR}/db/updates)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/db/updater.sh DESTINATION ${SHAREDIR}/db
      PERMISSIONS OWNER_READ
                  OWNER_WRITE
                  OWNER_EXECUTE
@@ -93,15 +93,15 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/db/updater.sh DESTINATION /usr/share/p
                  GROUP_EXECUTE
                  WORLD_READ
                  WORLD_EXECUTE)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/db/load-rules-db.sql DESTINATION /usr/share/privilege-control/db)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/db/220.libprivilege-updater.patch.sh DESTINATION /etc/opt/upgrade
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/db/load-rules-db.sql DESTINATION ${SHAREDIR}/db)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/db/220.libprivilege-updater.patch.sh DESTINATION ${TZ_SYS_ETC}/opt/upgrade
      PERMISSIONS OWNER_READ
                  OWNER_WRITE
                  OWNER_EXECUTE)
 
 
 INSTALL(FILES ${PROJECT_SOURCE_DIR}/smack-rules.service
-    DESTINATION /usr/lib/systemd/system
+    DESTINATION ${LIB_INSTALL_DIR}/systemd/system
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE)
 
 ADD_SUBDIRECTORY(api_feature_loader)

diff --git a/packaging/libprivilege-control.spec b/packaging/libprivilege-control.spec
index b1e5657..e6d034f 100644 (file)
--- a/packaging/libprivilege-control.spec
+++ b/packaging/libprivilege-control.spec
@@ -46,17 +46,18 @@ export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE"
 export CFLAGS="${CFLAGS} -Wno-implicit-function-declaration"
 %cmake . -DCMAKE_BUILD_TYPE=%{?build_type:%build_type}%{!?build_type:RELEASE} \
          -DCMAKE_VERBOSE_MAKEFILE=ON \
-       -DTZ_SYS_DB=%TZ_SYS_DB \
-       -DTZ_SYS_HOME=%TZ_SYS_HOME
+        -DTZ_SYS_DB=%TZ_SYS_DB \
+        -DTZ_SYS_HOME=%TZ_SYS_HOME \
+        -DTZ_SYS_ETC=%TZ_SYS_ETC
 
 VERBOSE=1 make %{?jobs:-j%jobs}
 
 %install
 %make_install
-mkdir -p %{buildroot}/usr/share/privilege-control/
+mkdir -p %{buildroot}%{_datadir}/privilege-control/
 
-mkdir -p %{buildroot}/usr/lib/systemd/system/multi-user.target.wants
-ln -sf /usr/lib/systemd/system/smack-rules.service %{buildroot}/usr/lib/systemd/system/multi-user.target.wants/smack-rules.service
+mkdir -p %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants
+ln -sf %{_libdir}/systemd/system/smack-rules.service %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants/smack-rules.service
 mkdir -p %{buildroot}%{TZ_SYS_DB}
 
 sed -i 's|TZ_SYS_DB|%{TZ_SYS_DB}|g' %{SOURCE1001}
@@ -64,12 +65,12 @@ sed -i 's|TZ_SYS_DB|%{TZ_SYS_DB}|g' %{SOURCE1001}
 %post
 /sbin/ldconfig
 
-/usr/share/privilege-control/db/updater.sh
+%{_datadir}/privilege-control/db/updater.sh
 chsmack -a 'System' %{TZ_SYS_DB}/.rules-db.db3*
 
 %postun -p /sbin/ldconfig
 
-api_feature_loader --verbose --dir=/usr/share/privilege-control/
+api_feature_loader --verbose --dir=%{_datadir}/privilege-control/
 
 %check
 ./db/updater.sh --check-files %{buildroot}
@@ -80,16 +81,16 @@ api_feature_loader --verbose --dir=/usr/share/privilege-control/
 %{_libdir}/*.so.*
 %{_libdir}/librules-db-sql-udf.so
 #systemd service
-/usr/lib/systemd/system/smack-rules.service
-/usr/bin/api_feature_loader
+%{_libdir}/systemd/system/smack-rules.service
+%{_bindir}/api_feature_loader
 #link to activate systemd service
-/usr/lib/systemd/system/multi-user.target.wants/smack-rules.service
-/usr/share/privilege-control/db/rules-db.sql
-/usr/share/privilege-control/db/rules-db-data.sql
-/usr/share/privilege-control/db/updater.sh
-/usr/share/privilege-control/db/updates/*
-/usr/share/privilege-control/db/load-rules-db.sql
-/etc/opt/upgrade/220.libprivilege-updater.patch.sh
+%{_libdir}/systemd/system/multi-user.target.wants/smack-rules.service
+%{_datadir}/privilege-control/db/rules-db.sql
+%{_datadir}/privilege-control/db/rules-db-data.sql
+%{_datadir}/privilege-control/db/updater.sh
+%{_datadir}/privilege-control/db/updates/*
+%{_datadir}/privilege-control/db/load-rules-db.sql
+%{TZ_SYS_ETC}/opt/upgrade/220.libprivilege-updater.patch.sh
 %attr(755, root, root) %dir %{TZ_SYS_DB}
 
 %files conf