Using define macro and correct the paths

list.in file can't figure out RPM macro. It must be changed as define macro which used in CMake.
If using %{_hal_libdir}, it already applied /hal/lib or /hal/lib64.

Change-Id: I6ae78fa7c517e681f4a5097877ea756262b64004

diff --git a/42-tota-gui-common.list.in b/42-tota-gui-common.list.in
index b810ce9e7c2254d723aef2ab89f77497620327f6..6fbd57ede23594deec6204bb6f1abf2e0466a4aa 100644 (file)
--- a/42-tota-gui-common.list.in
+++ b/42-tota-gui-common.list.in
@@ -121,6 +121,6 @@ VERBATIMS="
 WITHLIBS="
 /usr/bin/fota_gui
 /usr/bin/system-recovery_gui
-%{_hal_libdir}/hal/lib/libhal-backend-tdm.so
-%{_hal_libdir}/hal/lib/libhal-backend-tbm.so
+@SYSTEM_HAL_LIBDIR@/libhal-backend-tdm.so
+@SYSTEM_HAL_LIBDIR@/libhal-backend-tbm.so
 "

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e2aabe9f67d647c48cc0a9f75afbb4e21da376c6..59c2d0e23f3ff3876989e7f09cbd7257a55a9fd7 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,7 @@ STRING(FIND ${CMAKE_C_FLAGS} "mhard-float" IFFOUND2)
 
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src/)
 
-SET(SYSTEM_RECOVERY_LIBDIR ${LIBDIR})
+SET(SYSTEM_HAL_LIBDIR ${HAL_LIBDIR})
 SET(PACKAGE ${PROJECT_NAME})
 SET(PKGNAME "${PACKAGE}")
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})

diff --git a/packaging/firmware-update-system-ui.spec b/packaging/firmware-update-system-ui.spec
index c3b3238957f033163361e90897822aae05a3a300..fb85c031237020556dfca1727e315d3f3b31e3fb 100644 (file)
--- a/packaging/firmware-update-system-ui.spec
+++ b/packaging/firmware-update-system-ui.spec
@@ -46,7 +46,7 @@ export LDFLAGS+="-Wl,--rpath=%{_prefix}/lib -Wl,--as-needed"
 LDFLAGS="$LDFLAGS"
 
 %cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-               -DLIBDIR=%{_libdir}
+               -DHAL_LIBDIR=%{_hal_libdir}
 
 make %{?jobs:-j%jobs}