diff options
| -rwxr-xr-x | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | packaging/argos_watchdog.spec | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index be87f05..8ab0af1 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ PROJECT(${LIB_NAME} C) SET(PREFIX ${CMAKE_INSTALL_PREFIX}) SET(EXEC_PREFIX "${PREFIX}/bin") -SET(LIBDIR "${PREFIX}/lib") +SET(LIBDIR "${LIB_INSTALL_DIR}") SET(INCLUDEDIR "${PREFIX}/include/${PROJECT_NAME}") SET(SRCS src/argos.c) @@ -40,10 +40,10 @@ SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES SOVERSION ${MAJORVER}) SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES VERSION ${FULLVER}) TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS}) -INSTALL(TARGETS ${PROJECT_NAME} DESTINATION lib) +INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIBDIR}) CONFIGURE_FILE(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc @ONLY) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION lib/pkgconfig) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION ${LIBDIR}/pkgconfig) INSTALL(FILES ${HEADERS} DESTINATION include/${PROJECT_NAME}) diff --git a/packaging/argos_watchdog.spec b/packaging/argos_watchdog.spec index b5727b1..f2c6021 100644 --- a/packaging/argos_watchdog.spec +++ b/packaging/argos_watchdog.spec @@ -34,7 +34,7 @@ ARGOS library to detect application malfunctions (devel) cp %{SOURCE1} . MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'` -cmake . \ +%cmake . \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DFULLVER=%{version} \ -DMAJORVER=${MAJORVER} \ |