Fix build errors caused by an invalid library path.

Change-Id: Ia405022f1fcf8c26b68e991367a29c88e5d78bf5
Signed-off-by: Kyuho Jo <kyuho.jo@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 53ec145..2b73096 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ PROJECT(notification C)
 
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(EXEC_PREFIX "\${prefix}")
-SET(LIBDIR "\${prefix}/lib")
+SET(LIBDIR ${LIB_INSTALL_DIR})
 SET(INCLUDEDIR "\${prefix}/include/${PROJECT_NAME}")
 SET(ICONDIR "${PREFIX}/share/${PROJECT_NAME}")
 SET(RESDIR "${PREFIX}/share/${PROJECT_NAME}")
@@ -15,7 +15,7 @@ SET(VERSION ${MAJOR_VER}.1.0)
 
 ADD_SUBDIRECTORY(test-app)
 
-SET(SRCS 
+SET(SRCS
        ./src/notification.c
        ./src/notification_noti.c
        ./src/notification_ongoing.c
@@ -41,14 +41,14 @@ SET(HEADERS-SERVICE-DEVEL
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
 
 INCLUDE(FindPkgConfig)
-pkg_check_modules(pkgs REQUIRED 
-       sqlite3 
-       db-util 
-       vconf 
-       bundle 
-       dlog 
-       ail 
-       aul 
+pkg_check_modules(pkgs REQUIRED
+       sqlite3
+       db-util
+       vconf
+       bundle
+       dlog
+       ail
+       aul
        appsvc
        dbus-1
        dbus-glib-1
@@ -81,9 +81,11 @@ SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES SOVERSION ${MAJOR_VER})
 SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES VERSION ${VERSION})
 TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS})
 
+MESSAGE(STATUS "LIB_INSTALL_DIR: " ${LIB_INSTALL_DIR})
+
 CONFIGURE_FILE(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc @ONLY)
-INSTALL(TARGETS ${PROJECT_NAME} DESTINATION lib COMPONENT RuntimeLibraries)
-INSTALL(FILES ${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION lib/pkgconfig)
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries)
+INSTALL(FILES ${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 
 INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data/images/ DESTINATION ${IMGDIR} FILES_MATCHING PATTERN "*.png")
 
@@ -92,7 +94,7 @@ FOREACH(hfile ${HEADERS-DEVEL})
 ENDFOREACH(hfile)
 
 CONFIGURE_FILE(${PROJECT_NAME}-service.pc.in ${PROJECT_NAME}-service.pc @ONLY)
-INSTALL(FILES ${CMAKE_BINARY_DIR}/${PROJECT_NAME}-service.pc DESTINATION lib/pkgconfig)
+INSTALL(FILES ${CMAKE_BINARY_DIR}/${PROJECT_NAME}-service.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 
 FOREACH(hfile ${HEADERS-SERVICE-DEVEL})
        INSTALL(FILES ${CMAKE_SOURCE_DIR}/${hfile} DESTINATION include/${PROJECT_NAME}/service)

diff --git a/packaging/notification.spec b/packaging/notification.spec
index 1b8aa1a..39f759f 100644 (file)
--- a/packaging/notification.spec
+++ b/packaging/notification.spec
@@ -3,7 +3,7 @@ Summary:    notification library
 Version:    0.2.25
 Release:    1
 Group:      TBD
-License:    Apache License, Version 2.0
+License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
 BuildRequires: pkgconfig(sqlite3)
 BuildRequires: pkgconfig(db-util)
@@ -62,7 +62,8 @@ export CXXFLAGS="$CXXFLAGS -DTIZEN_DEBUG_ENABLE"
 export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE"
 %endif
 export LDFLAGS+="-Wl,--rpath=%{_prefix}/lib -Wl,--as-needed"
-LDFLAGS="$LDFLAGS" cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
+LDFLAGS="$LDFLAGS"
+%cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
 make %{?jobs:-j%jobs}
 
 %install