PTREL-129: Fix the path used for the pkgcmd backend

Start using the build system passed in %{_sysconfdir} as
the prefix for the package-manager to match what the pkgmgr
is doing.

Change-Id: Ifd9015609a2e9e787c921b0a26f9c133251ae55f
Signed-off-by: Rusty Lynch <rusty.lynch@intel.com>

diff --git a/configuration/CMakeLists.txt b/configuration/CMakeLists.txt
index 380f512..a900093 100644 (file)
--- a/configuration/CMakeLists.txt
+++ b/configuration/CMakeLists.txt
@@ -1,2 +1,2 @@
 FILE(GLOB XSD_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*.xsd")
-INSTALL(FILES ${XSD_FILES} DESTINATION /usr/etc/wrt-installer/)
+INSTALL(FILES ${XSD_FILES} DESTINATION ${SYSCONFDIR}/wrt-installer/)

diff --git a/packaging/wrt-installer.spec b/packaging/wrt-installer.spec
index 83326b4..6fbfe9c 100644 (file)
--- a/packaging/wrt-installer.spec
+++ b/packaging/wrt-installer.spec
@@ -86,6 +86,7 @@ LDFLAGS="$LDFLAGS"
 %else
          -DDECRYPT_SUPPORT=Off \
 %endif
+        -DSYSCONFDIR=%{_sysconfdir} \
         -DSMACK=Off \
         -DDPL_LOG=ON \
         -DCMAKE_BUILD_TYPE=%{?build_type:%build_type} \
@@ -106,7 +107,7 @@ rm -rf %{buildroot}
 chmod +s /usr/bin/wrt-installer
 
 #symlink for package manager
-%define pkg_manager_backend_path "/usr/etc/package-manager/backend"
+%define pkg_manager_backend_path %{_sysconfdir}"/package-manager/backend"
 ln -sf /usr/bin/wrt-installer %{pkg_manager_backend_path}/wgt
 ln -sf %{pkg_manager_backend_path}/wgt %{pkg_manager_backend_path}/Wgt
 ln -sf %{pkg_manager_backend_path}/wgt %{pkg_manager_backend_path}/wGt
@@ -127,8 +128,8 @@ mkdir -p /opt/share/icons/default/small
 %files
 %manifest %{name}.manifest
 %attr(755,root,root) %{_bindir}/wrt-installer
-/usr/etc/package-manager/backendlib/libwgt.so
-%attr(644,root,root) /usr/etc/wrt-installer/*.xsd
+%{_sysconfdir}/package-manager/backendlib/libwgt.so
+%attr(644,root,root) %{_sysconfdir}/wrt-installer/*.xsd
 %{_datadir}/license/%{name}
 %if %{with_tests}
     %attr(755,root,root) %{_bindir}/wrt-installer-tests-*

diff --git a/src/pkg-manager/CMakeLists.txt b/src/pkg-manager/CMakeLists.txt
index 3755eff..e454926 100755 (executable)
--- a/src/pkg-manager/CMakeLists.txt
+++ b/src/pkg-manager/CMakeLists.txt
@@ -53,7 +53,7 @@ SET_TARGET_PROPERTIES(${TARGET_BACKEND_LIB} PROPERTIES
 )
 
 INSTALL(TARGETS ${TARGET_BACKEND_LIB}
-    DESTINATION /usr/etc/package-manager/backendlib
+    DESTINATION ${SYSCONFDIR}/package-manager/backendlib
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
 )