diff options
| -rw-r--r-- | CMakeLists.txt | 9 | ||||
| -rwxr-xr-x | media-thumbnail.pc.in | 4 | ||||
| -rw-r--r-- | packaging/libmedia-thumbnail.spec | 2 |
3 files changed, 7 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4c7439a..a6ac8c4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,7 +33,6 @@ SET(BINDIR "${PREFIX}/bin") SET(LOCALBINDIR "${PREFIX}/local/bin") SET(DATADIR "${PREFIX}/share") SET(EXEC_PREFIX "\${prefix}") -SET(LIBDIR "\${prefix}/lib") SET(INCLUDEDIR "\${prefix}/include") IF("${CMAKE_BUILD_TYPE}" STREQUAL "") @@ -74,9 +73,9 @@ ADD_DEFINITIONS("-D_USE_MEDIA_UTIL_") SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--hash-style=both") CONFIGURE_FILE(media-thumbnail.pc.in media-thumbnail.pc @ONLY) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/media-thumbnail.pc DESTINATION lib/pkgconfig) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/media-thumbnail.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) -LINK_DIRECTORIES(lib) +LINK_DIRECTORIES(${LIB_INSTALL_DIR}) ADD_LIBRARY(${MEDIAHASH-LIB} SHARED ${HASH_SRCS}) SET_TARGET_PROPERTIES(${MEDIAHASH-LIB} PROPERTIES SOVERSION ${VERSION_MAJOR}) @@ -86,8 +85,8 @@ TARGET_LINK_LIBRARIES(${MEDIATHUMB-LIB} ${pkgs_LDFLAGS} ${MEDIAHASH-LIB}) SET_TARGET_PROPERTIES(${MEDIATHUMB-LIB} PROPERTIES SOVERSION ${VERSION_MAJOR}) SET_TARGET_PROPERTIES(${MEDIATHUMB-LIB} PROPERTIES VERSION ${VERSION}) -INSTALL(TARGETS ${MEDIATHUMB-LIB} LIBRARY DESTINATION lib) -INSTALL(TARGETS ${MEDIAHASH-LIB} LIBRARY DESTINATION lib) +INSTALL(TARGETS ${MEDIATHUMB-LIB} LIBRARY DESTINATION ${LIB_INSTALL_DIR}) +INSTALL(TARGETS ${MEDIAHASH-LIB} LIBRARY DESTINATION ${LIB_INSTALL_DIR}) ADD_EXECUTABLE(media-thumbnail-server ${THUMB-SERVER}) TARGET_LINK_LIBRARIES(media-thumbnail-server ${pkgs_LDFLAGS} ${MEDIATHUMB-LIB} ) diff --git a/media-thumbnail.pc.in b/media-thumbnail.pc.in index b743f00..7b4ec54 100755 --- a/media-thumbnail.pc.in +++ b/media-thumbnail.pc.in @@ -2,8 +2,8 @@ prefix=@PREFIX@ exec_prefix=@EXEC_PREFIX@ -libdir=@LIBDIR@ -includedir=@INCLUDEDIR@ +libdir=@LIB_INSTALL_DIR@ +includedir=@INCLUDE_INSTALL_DIR@ Name: @PROJECT_NAME@ Description: Samsung Linux platform @PROJECT_NAME@ library diff --git a/packaging/libmedia-thumbnail.spec b/packaging/libmedia-thumbnail.spec index 2c1a0c3..324849d 100644 --- a/packaging/libmedia-thumbnail.spec +++ b/packaging/libmedia-thumbnail.spec @@ -50,7 +50,7 @@ Description: Media Thumbnail Server. %build -cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} +%cmake . make %{?jobs:-j%jobs} %install |