changed install paths to proper ones

9 files changed, 18 insertions, 17 deletions

diff --git a/accel-pptpd/CMakeLists.txt b/accel-pptpd/CMakeLists.txt
index 3e83d590..0d3641af 100644
--- a/accel-pptpd/CMakeLists.txt
+++ b/accel-pptpd/CMakeLists.txt
@@ -85,15 +85,16 @@ TARGET_LINK_LIBRARIES(accel-pptpd triton rt pthread crypto pcre)
 set_property(TARGET accel-pptpd PROPERTY CMAKE_SKIP_BUILD_RPATH FALSE)
 set_property(TARGET accel-pptpd PROPERTY CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
 set_property(TARGET accel-pptpd PROPERTY INSTALL_RPATH_USE_LINK_PATH FALSE)
-set_property(TARGET accel-pptpd PROPERTY INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/usr/lib/accel-pptp)
+set_property(TARGET accel-pptpd PROPERTY INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib/accel-pptp)
 
 INSTALL(TARGETS accel-pptpd
-	RUNTIME DESTINATION usr/sbin
+	RUNTIME DESTINATION sbin
 )
 
 INSTALL(FILES accel-pptp.conf DESTINATION /etc RENAME accel-pptp.conf.dist)
-INSTALL(FILES accel-pptp.conf.5 DESTINATION usr/share/man/man5)
+INSTALL(FILES accel-pptp.conf.5 DESTINATION share/man/man5)
 
 INSTALL(CODE "EXECUTE_PROCESS(COMMAND mkdir -p /var/log/accel-pptp)")
 INSTALL(CODE "EXECUTE_PROCESS(COMMAND mkdir -p /var/run/accel-pptp)")
 INSTALL(CODE "EXECUTE_PROCESS(COMMAND 'echo 0 > /var/run/accel-pptp/seq')")
+
diff --git a/accel-pptpd/auth/CMakeLists.txt b/accel-pptpd/auth/CMakeLists.txt
index 808e7d84..dbf4d13b 100644
--- a/accel-pptpd/auth/CMakeLists.txt
+++ b/accel-pptpd/auth/CMakeLists.txt
@@ -8,6 +8,6 @@ TARGET_LINK_LIBRARIES(auth_mschap_v1 crypto)
 TARGET_LINK_LIBRARIES(auth_mschap_v2 crypto)
 
 INSTALL(TARGETS auth_pap auth_chap_md5 auth_mschap_v1 auth_mschap_v2
-	LIBRARY DESTINATION usr/lib/accel-pptp
+	LIBRARY DESTINATION lib/accel-pptp
 )
 
diff --git a/accel-pptpd/ctrl/l2tp/CMakeLists.txt b/accel-pptpd/ctrl/l2tp/CMakeLists.txt
index 49310072..90bf8e71 100644
--- a/accel-pptpd/ctrl/l2tp/CMakeLists.txt
+++ b/accel-pptpd/ctrl/l2tp/CMakeLists.txt
@@ -10,8 +10,8 @@ ADD_LIBRARY(l2tp SHARED
 )
 #TARGET_LINK_LIBRARIES(l2tp nl nl-genl)
 
-INSTALL(TARGETS l2tp LIBRARY DESTINATION usr/lib/accel-pptp)
+INSTALL(TARGETS l2tp LIBRARY DESTINATION lib/accel-pptp)
 
 FILE(GLOB dict "${CMAKE_CURRENT_SOURCE_DIR}/dict/*")
-INSTALL(FILES ${dict} DESTINATION usr/share/accel-pptp/l2tp)
+INSTALL(FILES ${dict} DESTINATION share/accel-pptp/l2tp)
 
diff --git a/accel-pptpd/ctrl/pppoe/CMakeLists.txt b/accel-pptpd/ctrl/pppoe/CMakeLists.txt
index 6e70e4cc..5f5c5e4d 100644
--- a/accel-pptpd/ctrl/pppoe/CMakeLists.txt
+++ b/accel-pptpd/ctrl/pppoe/CMakeLists.txt
@@ -9,4 +9,4 @@ ADD_LIBRARY(pppoe SHARED
 
 TARGET_LINK_LIBRARIES(pppoe crypto)
 
-INSTALL(TARGETS pppoe LIBRARY DESTINATION usr/lib/accel-pptp)
+INSTALL(TARGETS pppoe LIBRARY DESTINATION lib/accel-pptp)
diff --git a/accel-pptpd/ctrl/pptp/CMakeLists.txt b/accel-pptpd/ctrl/pptp/CMakeLists.txt
index 19e53b27..e9c27791 100644
--- a/accel-pptpd/ctrl/pptp/CMakeLists.txt
+++ b/accel-pptpd/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 usr/lib/accel-pptp )
+INSTALL(TARGETS pptp LIBRARY DESTINATION lib/accel-pptp )
diff --git a/accel-pptpd/extra/CMakeLists.txt b/accel-pptpd/extra/CMakeLists.txt
index dc55840e..282af1a3 100644
--- a/accel-pptpd/extra/CMakeLists.txt
+++ b/accel-pptpd/extra/CMakeLists.txt
@@ -4,12 +4,12 @@ ADD_LIBRARY(sigchld SHARED sigchld.c)
 ADD_LIBRARY(chap-secrets SHARED chap-secrets.c)
 
 INSTALL(TARGETS pppd_compat ippool sigchld chap-secrets
-	LIBRARY DESTINATION usr/lib/accel-pptp
+	LIBRARY DESTINATION lib/accel-pptp
 )
 
 IF (SHAPER)
 	ADD_LIBRARY(shaper_tbf SHARED shaper_tbf.c)
 	TARGET_LINK_LIBRARIES(shaper_tbf nl nl-route m)
-	INSTALL(TARGETS shaper_tbf LIBRARY DESTINATION usr/lib/accel-pptp)
+	INSTALL(TARGETS shaper_tbf LIBRARY DESTINATION lib/accel-pptp)
 ENDIF (SHAPER)
 
diff --git a/accel-pptpd/logs/CMakeLists.txt b/accel-pptpd/logs/CMakeLists.txt
index ffcdc2f3..0665e9a5 100644
--- a/accel-pptpd/logs/CMakeLists.txt
+++ b/accel-pptpd/logs/CMakeLists.txt
@@ -4,14 +4,14 @@ TARGET_LINK_LIBRARIES(log_file rt)
 ADD_LIBRARY(log_tcp SHARED log_tcp.c)
 
 INSTALL(TARGETS log_file log_tcp
-	LIBRARY DESTINATION usr/lib/accel-pptp
+	LIBRARY DESTINATION lib/accel-pptp
 )
 
 IF(LOG_PGSQL)
 	ADD_LIBRARY(log_pgsql SHARED log_pgsql.c)
 	TARGET_LINK_LIBRARIES(log_pgsql pq)
 	INSTALL(TARGETS log_pgsql
-		LIBRARY DESTINATION usr/lib/accel-pptp
+		LIBRARY DESTINATION lib/accel-pptp
 	)
 ENDIF(LOG_PGSQL)
 
diff --git a/accel-pptpd/radius/CMakeLists.txt b/accel-pptpd/radius/CMakeLists.txt
index 5ad7211d..8b8e67d4 100644
--- a/accel-pptpd/radius/CMakeLists.txt
+++ b/accel-pptpd/radius/CMakeLists.txt
@@ -8,12 +8,12 @@ SET(sources
 	radius.c
 )
 
-ADD_DEFINITIONS(-DDICTIONARY="${CMAKE_INSTALL_PREFIX}/usr/share/accel-pptp/radius/dictionary")
+ADD_DEFINITIONS(-DDICTIONARY="${CMAKE_INSTALL_PREFIX}/share/accel-pptp/radius/dictionary")
 
 ADD_LIBRARY(radius SHARED ${sources})
 
 INSTALL(TARGETS radius
-	LIBRARY DESTINATION usr/lib/accel-pptp
+	LIBRARY DESTINATION lib/accel-pptp
 )
 FILE(GLOB dict "${CMAKE_CURRENT_SOURCE_DIR}/dict/*")
-INSTALL(FILES ${dict} DESTINATION usr/share/accel-pptp/radius)
+INSTALL(FILES ${dict} DESTINATION share/accel-pptp/radius)
diff --git a/accel-pptpd/triton/CMakeLists.txt b/accel-pptpd/triton/CMakeLists.txt
index e9133ae7..0c6786d9 100644
--- a/accel-pptpd/triton/CMakeLists.txt
+++ b/accel-pptpd/triton/CMakeLists.txt
@@ -30,11 +30,11 @@ ENDIF (HAVE_TIMERFD)
 
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
-ADD_DEFINITIONS(-DMODULE_PATH="${CMAKE_INSTALL_PREFIX}/usr/lib/accel-pptp")
+ADD_DEFINITIONS(-DMODULE_PATH="${CMAKE_INSTALL_PREFIX}/lib/accel-pptp")
 
 ADD_LIBRARY(triton SHARED ${sources_c})
 TARGET_LINK_LIBRARIES(triton dl)
 
 INSTALL(TARGETS triton
-	LIBRARY DESTINATION usr/lib/accel-pptp
+	LIBRARY DESTINATION lib/accel-pptp
 )