fix Multi-user macro

Bug-Tizen: PTREL-381

Change-Id: If80a3f9bd694c9822b4d522487374d19df0da1a9
Signed-off-by: Jean-Benoit MARTIN <jean-benoit.martin@open.eurogiciel.org>

diff --git a/ace/CMakeLists.txt b/ace/CMakeLists.txt
index 02006e4..794a4b8 100644 (file)
--- a/ace/CMakeLists.txt
+++ b/ace/CMakeLists.txt
@@ -62,7 +62,7 @@ INSTALL(FILES
     ${CMAKE_CURRENT_SOURCE_DIR}/configuration/UnrestrictedPolicy.xml
     ${CMAKE_CURRENT_SOURCE_DIR}/configuration/WAC2.0Policy.xml
     ${CMAKE_CURRENT_SOURCE_DIR}/configuration/TizenPolicy.xml
-    DESTINATION /usr/etc/ace
+    DESTINATION ${TZ_SYS_ACE_CONF}
     PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ GROUP_WRITE)
 
 SET(ACE_LIB_DEPS_BASIC

diff --git a/etc/certificates/CMakeLists.txt b/etc/certificates/CMakeLists.txt
index 4a89dda..846b155 100644 (file)
--- a/etc/certificates/CMakeLists.txt
+++ b/etc/certificates/CMakeLists.txt
@@ -25,7 +25,7 @@ INSTALL(FILES
     ${CERT_DIR}/wac.root.preproduction.pem
     ${CERT_DIR}/wac.root.production.pem
     ${CERT_DIR}/wac.publisherid.pem
-    DESTINATION /opt/share/cert-svc/certs/code-signing/wac/
+    DESTINATION ${TZ_SYS_SHARE}/cert-svc/certs/code-signing/wac/
        )
 
  INSTALL(FILES
@@ -42,5 +42,5 @@ INSTALL(FILES
     ${CERT_DIR}/tizen-platform-class-root-authority.pem
     ${CERT_DIR}/tizen-public-class-developer-root.pem
     ${CERT_DIR}/tizen-public-class-root-authority.pem
-    DESTINATION /opt/share/cert-svc/certs/code-signing/tizen/
+    DESTINATION ${TZ_SYS_SHARE}/cert-svc/certs/code-signing/tizen/
     )

diff --git a/packaging/wrt-security.spec b/packaging/wrt-security.spec
index 9588fcd..4ac95bf 100644 (file)
--- a/packaging/wrt-security.spec
+++ b/packaging/wrt-security.spec
@@ -61,7 +61,9 @@ export LDFLAGS+="-Wl,--rpath=%{_libdir}"
 
 %cmake . -DDPL_LOG="ON" \
         -DVERSION=%{version} \
-        -DCMAKE_BUILD_TYPE=%{?build_type:%build_type}
+        -DCMAKE_BUILD_TYPE=%{?build_type:%build_type} \
+       -DTZ_SYS_ACE_CONF=%{TZ_SYS_ACE_CONF} \
+       -DTZ_SYS_SHARE=%{TZ_SYS_SHARE}
 make %{?jobs:-j%jobs}