merge with master

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 88c724f..6e0eedb 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,13 +46,13 @@ FOREACH(lib_file ${SUBMODULES})
        TARGET_LINK_LIBRARIES(${lib_file} ${pkgs_LDFLAGS})
        SET_TARGET_PROPERTIES(${lib_file} PROPERTIES SOVERSION ${VERSION_MAJOR})
        SET_TARGET_PROPERTIES(${lib_file} PROPERTIES VERSION ${VERSION})
-       INSTALL(TARGETS ${lib_file} DESTINATION lib COMPONENT RuntimeLibraries)
+       INSTALL(TARGETS ${lib_file} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries)
 ENDFOREACH(lib_file)
 
 FOREACH(pcfile ${SUBMODULES})
        CONFIGURE_FILE(${pcfile}.pc.in ${pcfile}.pc @ONLY)
        SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${pcfile}.pc")
-       INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${pcfile}.pc DESTINATION lib/pkgconfig)
+       INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${pcfile}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 ENDFOREACH(pcfile)
 
 FOREACH(hfile ${INSTALL_HEADERS})

diff --git a/packaging/status.spec b/packaging/status.spec
index df26f35..9233398 100755 (executable)
--- a/packaging/status.spec
+++ b/packaging/status.spec
@@ -1,7 +1,7 @@
 Name:       status
 Summary:    status library
 Version:    0.0.1
-Release:    2
+Release:    1
 Group:      TBD
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
@@ -11,7 +11,8 @@ BuildRequires: pkgconfig(vconf)
 BuildRequires: pkgconfig(aul)
 BuildRequires: cmake
 Requires(post): /sbin/ldconfig
-requires(postun): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+
 %description
 Status library.
 
@@ -27,8 +28,8 @@ Requires:   %{name} = %{version}-%{release}
 Status library (devel).
 
 %build
-export LDFLAGS+="-Wl,--rpath=%{_prefix}/lib -Wl,--as-needed"
-LDFLAGS="$LDFLAGS" cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
+export LDFLAGS+="-Wl,--rpath=%{_libdir} -Wl,--as-needed"
+%cmake .
 make %{?jobs:-j%jobs}
 
 %install