Fix build for x64 : Remove hardcoded library path

Change-Id: Ia2f938444db9050754a2b7cfcbcb743028e1e1dc
Signed-off-by: Baptiste DURAND <baptiste.durand@eurogiciel.fr>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bcc6c29..d412314 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -76,6 +76,7 @@ MESSAGE("FLAGS: ${CMAKE_C_FLAGS}")
 
 ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
 ADD_DEFINITIONS("-DPREDEFINE_SO_DIR=\"${LIB_INSTALL_DIR}/ss_predefine/\"")
+ADD_DEFINITIONS("-DLIBPATH=\"${LIB_INSTALL_DIR}/\"")
 ADD_DEFINITIONS("-DFACTORYFS=\"$ENV{FACTORYFS}\"")
 IF( $ENV{ARCH} MATCHES "arm" )
        ADD_DEFINITIONS("-DTARGET")
@@ -91,14 +92,14 @@ CONFIGURE_FILE(${UDEV_RULES}.in ${UDEV_RULES} @ONLY)
 ADD_LIBRARY(${DEVICED_NAME} SHARED ${DEVICED_SRCS})
 TARGET_LINK_LIBRARIES(${DEVICED_NAME} ${pkgs_LDFLAGS})
 SET_TARGET_PROPERTIES(${DEVICED_NAME} PROPERTIES VERSION ${VERSION})
-INSTALL(TARGETS ${DEVICED_NAME} DESTINATION lib COMPONENT RuntimeLibraries)
+INSTALL(TARGETS ${DEVICED_NAME} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries)
 
 FOREACH(hfile ${DEVICED_HEADERS})
        INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${hfile} DESTINATION include/${DEVICED_NAME})
 ENDFOREACH(hfile)
 
 CONFIGURE_FILE(${DEVICED_NAME}.pc.in ${DEVICED_NAME}.pc @ONLY)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DEVICED_NAME}.pc DESTINATION lib/pkgconfig)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DEVICED_NAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 
 ADD_EXECUTABLE(${PROJECT_NAME} ${SRCS})
 TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS} "-ldl" "-ludev" "-lsmack")
@@ -109,7 +110,7 @@ INSTALL(FILES ${UDEV_RULES} DESTINATION ${UDEV_RULES_PATH})
 INSTALL(FILES system-server.conf DESTINATION /etc/dbus-1/system.d)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/packaging/system-server.rule DESTINATION /opt/etc/smack/accesses.d)
 INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/scripts/mmc-smack-label DESTINATION bin)
-INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/scripts/shutdown.sh DESTINATION /usr/lib/system-server)
+INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/scripts/shutdown.sh DESTINATION ${LIB_INSTALL_DIR}/system-server)
 
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/systemd/system-server.service DESTINATION /usr/lib/systemd/system)
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/systemd/system-server.socket  DESTINATION /usr/lib/systemd/system)

diff --git a/deviced.pc.in b/deviced.pc.in
index 3de6ff0..5c30b56 100644 (file)
--- a/deviced.pc.in
+++ b/deviced.pc.in
@@ -2,7 +2,7 @@
 
 prefix=@PREFIX@
 exec_prefix=@EXEC_PREFIX@
-libdir=/usr/lib
+libdir=@LIB_INSTALL_DIR@
 includedir=/usr/include/deviced
 
 Name: deviced library

diff --git a/packaging/system-server.spec b/packaging/system-server.spec
index 408ad07..bb5a7ae 100755 (executable)
--- a/packaging/system-server.spec
+++ b/packaging/system-server.spec
@@ -145,7 +145,7 @@ systemctl daemon-reload
 %config %{_sysconfdir}/dbus-1/system.d/system-server.conf
 %{_bindir}/system_server
 /opt/etc/smack/accesses.d/system-server.rule
-/usr/lib/system-server/shutdown.sh
+%{_libdir}/system-server/shutdown.sh
 %if 0%{?simulator}
 %exclude %{_bindir}/restart
 %else

diff --git a/restarter/restart.c b/restarter/restart.c
index 5e40f33..befb8c0 100644 (file)
--- a/restarter/restart.c
+++ b/restarter/restart.c
@@ -21,7 +21,7 @@
 
 int main(int argc, char *argv[])
 {
-       system("/usr/lib/system-server/shutdown.sh &");
+       system( LIBPATH"/system-server/shutdown.sh &");
         sleep(1);
         sync();
        reboot(RB_AUTOBOOT);

diff --git a/src/core/predefine.c b/src/core/predefine.c
index 07f3102..4914d30 100644 (file)
--- a/src/core/predefine.c
+++ b/src/core/predefine.c
@@ -44,8 +44,6 @@
 #include "data.h"
 #include "common.h"
 
-#define PREDEFINE_SO_DIR               PREFIX"/lib/ss_predefine/"
-
 #define CALL_EXEC_PATH                 PREFIX"/bin/call"
 #define LOWMEM_EXEC_PATH               PREFIX"/bin/lowmem-popup"
 #define LOWBAT_EXEC_PATH               PREFIX"/bin/lowbatt-popup"
@@ -557,7 +555,7 @@ int internal_poweroff_def_predefine_action(int argc, char **argv)
 {
        int ret;
 
-       system("/usr/lib/system-server/shutdown.sh &");
+       system( LIBPATH"/system-server/shutdown.sh &");
        sync();
 
        gettimeofday(&tv_start_poweroff, NULL);
@@ -733,7 +731,7 @@ int restart_def_predefine_action(int argc, char **argv)
 
        heynoti_publish(POWEROFF_NOTI_NAME);
        pm_change_state(LCD_NORMAL);
-       system("/usr/lib/system-server/shutdown.sh &");
+       system(LIBPATH"/system-server/shutdown.sh &");
        sync();
 
        gettimeofday(&tv_start_poweroff, NULL);