diff options
| author | Kozlov Dmitry <xeb@mail.ru> | 2013-01-11 16:27:49 +0400 |
|---|---|---|
| committer | Kozlov Dmitry <xeb@mail.ru> | 2013-01-11 16:27:49 +0400 |
| commit | f1e3ddf8d12ccdc2d20976e5960985853bed6454 (patch) | |
| tree | 098149e5ac79b02fba95464717e4c763add79d1e /accel-pppd/ctrl | |
| parent | 3a68b66387b2e352d4ffe60c0dd4aeeb2c599fb4 (diff) | |
| parent | c223aade3cd0c9ee651902f70da5497aae0f8014 (diff) | |
| download | accel-ppp-f1e3ddf8d12ccdc2d20976e5960985853bed6454.tar.gz accel-ppp-f1e3ddf8d12ccdc2d20976e5960985853bed6454.zip | |
Merge branch '1.7' of ssh://accel-ppp.git.sourceforge.net/gitroot/accel-ppp/accel-ppp into 1.7
Diffstat (limited to 'accel-pppd/ctrl')
| -rw-r--r-- | accel-pppd/ctrl/l2tp/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | accel-pppd/ctrl/pppoe/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | accel-pppd/ctrl/pptp/CMakeLists.txt | 2 |
3 files changed, 3 insertions, 7 deletions
diff --git a/accel-pppd/ctrl/l2tp/CMakeLists.txt b/accel-pppd/ctrl/l2tp/CMakeLists.txt index b2952899..66dd3fc6 100644 --- a/accel-pppd/ctrl/l2tp/CMakeLists.txt +++ b/accel-pppd/ctrl/l2tp/CMakeLists.txt @@ -10,7 +10,7 @@ ADD_LIBRARY(l2tp SHARED ) #TARGET_LINK_LIBRARIES(l2tp nl nl-genl) -INSTALL(TARGETS l2tp LIBRARY DESTINATION lib/accel-ppp) +INSTALL(TARGETS l2tp LIBRARY DESTINATION lib${LIB_SUFFIX}/accel-ppp) FILE(GLOB dict "${CMAKE_CURRENT_SOURCE_DIR}/dict/*") INSTALL(FILES ${dict} DESTINATION share/accel-ppp/l2tp) diff --git a/accel-pppd/ctrl/pppoe/CMakeLists.txt b/accel-pppd/ctrl/pppoe/CMakeLists.txt index a38cfb2c..fad9efd0 100644 --- a/accel-pppd/ctrl/pppoe/CMakeLists.txt +++ b/accel-pppd/ctrl/pppoe/CMakeLists.txt @@ -13,9 +13,5 @@ ENDIF(RADIUS) ADD_LIBRARY(pppoe SHARED ${sources}) TARGET_LINK_LIBRARIES(pppoe ${crypto_lib}) -#set_property(TARGET pppoe PROPERTY CMAKE_SKIP_BUILD_RPATH FALSE) -#set_property(TARGET pppoe PROPERTY CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) -#set_property(TARGET pppoe PROPERTY INSTALL_RPATH_USE_LINK_PATH FALSE) -#set_property(TARGET pppoe PROPERTY INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib/accel-ppp) -INSTALL(TARGETS pppoe LIBRARY DESTINATION lib/accel-ppp) +INSTALL(TARGETS pppoe LIBRARY DESTINATION lib${LIB_SUFFIX}/accel-ppp) diff --git a/accel-pppd/ctrl/pptp/CMakeLists.txt b/accel-pppd/ctrl/pptp/CMakeLists.txt index 3199e7f1..aa011d1a 100644 --- a/accel-pppd/ctrl/pptp/CMakeLists.txt +++ b/accel-pppd/ctrl/pptp/CMakeLists.txt @@ -2,4 +2,4 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) ADD_LIBRARY(pptp SHARED pptp.c) -INSTALL(TARGETS pptp LIBRARY DESTINATION lib/accel-ppp ) +INSTALL(TARGETS pptp LIBRARY DESTINATION lib${LIB_SUFFIX}/accel-ppp ) |