Fix x86_64 build

  - Change library path var in *.pc.in
  - Use %cmake macro to set default path
  - Fix hard-coded library path in CMakeLists.txt and spec file

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 930bf5e..1ee52d7 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,6 @@ SET(HEADERS utilX.h)
 
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(EXEC_PREFIX "\${prefix}")
-SET(LIBDIR "\${prefix}/lib")
 SET(INCLUDEDIR "\${prefix}/include")
 SET(VERSION_MAJOR 1)
 SET(VERSION "${VERSION_MAJOR}.1.0")
@@ -37,8 +36,8 @@ SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES VERSION ${VERSION})
 
 CONFIGURE_FILE(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc @ONLY)
 
-INSTALL(TARGETS ${PROJECT_NAME} DESTINATION lib COMPONENT RuntimeLibraries)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION lib/pkgconfig)
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 
 FOREACH(hfile ${HEADERS})
        INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${hfile} DESTINATION include)

diff --git a/packaging/libslp-utilx.spec b/packaging/libslp-utilx.spec
index f2d51d5..4850100 100644 (file)
--- a/packaging/libslp-utilx.spec
+++ b/packaging/libslp-utilx.spec
@@ -1,13 +1,10 @@
-#sbs-git:slp/pkgs/l/libslp-utilx libslp-utilx 0.1.7 5957503c84e65113399e346c7d5618e73957d6ff
 Name:       libslp-utilx
 Summary:    utilX
 Version:    0.1.20
 Release:    1.1
-Group:      System/Libraries
+Group:      UI Framework/Libraries
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
 
 BuildRequires: cmake
 BuildRequires: pkgconfig(libdri2)
@@ -37,7 +34,7 @@ Utility functions for the XWindow (developement files)
 
 
 %build
-cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
+%cmake .
 
 
 make %{?jobs:-j%jobs}
@@ -57,14 +54,14 @@ cp %{_builddir}/%{buildsubdir}/LICENSE.APLv2 %{buildroot}/usr/share/license/%{na
 
 %files
 %defattr(-,root,root,-)
-/usr/lib/libutilX.so.*
+%{_libdir}/libutilX.so.*
 /usr/share/license/%{name}
 
 %files devel
 %defattr(-,root,root,-)
 /usr/include/utilX.h
-/usr/lib/libutilX.so
-/usr/lib/pkgconfig/utilX.pc
+%{_libdir}/libutilX.so
+%{_libdir}/pkgconfig/utilX.pc
 
 
 

diff --git a/utilX.pc.in b/utilX.pc.in
index 5079edf..2c3b2c1 100644 (file)
--- a/utilX.pc.in
+++ b/utilX.pc.in
@@ -2,7 +2,7 @@
 
 prefix=@PREFIX@
 exec_prefix=@EXEC_PREFIX@
-libdir=@LIBDIR@
+libdir=@LIB_INSTALL_DIR@
 includedir=@INCLUDEDIR@
 
 Name: libSLP-utilX