Fix x86_64 build and remove hardcoding

  - Fix hard-coded library path in source : source files + CMakeLists.txt
  - Fix systemd related files library path (remove %{_libdir})
  - Use %cmake macro to set default path
  - Add suitable LD_Library_Path in *.in

Change-Id: I691d625b2981795917c32f24a8c2d707fa84e8ae
Signed-off-by: Anas Nashif <anas.nashif@intel.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 15b6336..5cd2f6c 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,7 +37,7 @@ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}")
 ADD_DEFINITIONS("-DENABLE_KEY_FILTER")
 ADD_DEFINITIONS("-DENABLE_X_LCD_ONOFF")
 ADD_DEFINITIONS("-DENABLE_DLOG_OUT")
-
+ADD_DEFINITIONS("-DLIBPREFIX=\"${LIB_INSTALL_DIR}\"")
 ADD_EXECUTABLE(${PROJECT_NAME} ${SRCS})
 TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS} -ldl)
 

diff --git a/packaging/power-manager.spec b/packaging/power-manager.spec
index 32bf24c..45dcc0b 100644 (file)
--- a/packaging/power-manager.spec
+++ b/packaging/power-manager.spec
@@ -39,7 +39,7 @@ CFLAGS+=" -DX86"
 %endif
 export CFLAGS
 %endif
-cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
+%cmake .
 
 make %{?jobs:-j%jobs}
 
@@ -47,9 +47,9 @@ make %{?jobs:-j%jobs}
 rm -rf %{buildroot}
 %make_install
 
-mkdir -p %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants
-install -m 0644 %{SOURCE1} %{buildroot}%{_libdir}/systemd/system/power-manager.service
-ln -s ../power-manager.service %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants/power-manager.service
+mkdir -p %{buildroot}/usr/lib/systemd/system/multi-user.target.wants
+install -m 0644 %{SOURCE1} %{buildroot}/usr/lib/systemd/system/power-manager.service
+ln -s ../power-manager.service %{buildroot}/usr/lib/systemd/system/multi-user.target.wants/power-manager.service
 
 mkdir -p %{buildroot}%{_sysconfdir}/rc.d/rc3.d/
 mkdir -p %{buildroot}%{_sysconfdir}/rc.d/rc5.d/
@@ -81,6 +81,6 @@ fi
 %{_bindir}/pm_event
 %{_bindir}/pmctrl
 %{_bindir}/power_manager
-%{_libdir}/systemd/system/power-manager.service
-%{_libdir}/systemd/system/multi-user.target.wants/power-manager.service
+/usr/lib/systemd/system/power-manager.service
+/usr/lib/systemd/system/multi-user.target.wants/power-manager.service
 %{_datadir}/power-manager/udev-rules/91-power-manager.rules

diff --git a/pm_event/CMakeLists.txt b/pm_event/CMakeLists.txt
index 2b69259..3598f46 100644 (file)
--- a/pm_event/CMakeLists.txt
+++ b/pm_event/CMakeLists.txt
@@ -4,7 +4,6 @@ PROJECT(pm_event C)
 SET(SRCS pm_event.c)
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(EXEC_PREFIX "\${prefix}")
-SET(LIBDIR "\${prefix}/lib")
 SET(INCLUDEDIR "\${prefix}/include")
 SET(VERSION 0.1.9)
 INCLUDE(FindPkgConfig)

diff --git a/pmctrl.in b/pmctrl.in
index 72dda7d..5362f38 100644 (file)
--- a/pmctrl.in
+++ b/pmctrl.in
@@ -2,7 +2,7 @@
 
 KERNVER=`uname -r`
 
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib:@LIB_INSTALL_DIR@
 export PATH=$PATH:/usr/bin
 export ELM_FONT_PATH=@PREFIX@/share/SLP/fonts:@PREFIX@/share/SLP/licensed_fonts:@PREFIX@/share/fonts/truetype/ttf-bitstream-vera
 export PM_EXEC_PRG=@PREFIX@/bin/@IDLE_LOCK@