merge with master

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f9c54f1..002db9a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,13 +56,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/NOTICE b/NOTICE
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/badge_log.h b/include/badge_log.h
index 966e585..134eb2c 100755 (executable)
--- a/include/badge_log.h
+++ b/include/badge_log.h
@@ -30,7 +30,7 @@
 #ifdef LOG_TAG
 #undef LOG_TAG
 #endif
-#define LOG_TAG "libbadge"
+#define LOG_TAG "BADGE"
 
 #define DBG(fmt , args...) \
        do { \

diff --git a/packaging/badge.spec b/packaging/badge.spec
index 9a249d8..d8c9075 100755 (executable)
--- a/packaging/badge.spec
+++ b/packaging/badge.spec
@@ -29,7 +29,7 @@ Badge library (devel).
 
 %build
 export LDFLAGS+="-Wl,--rpath=%{_prefix}/lib -Wl,--as-needed"
-LDFLAGS="$LDFLAGS" cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
+LDFLAGS="$LDFLAGS" %cmake . 
 make %{?jobs:-j%jobs}
 
 %install