]>
Commit | Line | Data |
---|---|---|
dbc59aa0 SP |
1 | diff -ur accel-ppp-1.6.1/accel-pppd/auth/CMakeLists.txt accel-ppp-1.6.1.new/accel-pppd/auth/CMakeLists.txt |
2 | --- accel-ppp-1.6.1/accel-pppd/auth/CMakeLists.txt 2012-03-20 06:43:40.000000000 +0100 | |
3 | +++ accel-ppp-1.6.1.new/accel-pppd/auth/CMakeLists.txt 2012-04-17 15:08:00.634062871 +0200 | |
4 | @@ -8,6 +8,6 @@ | |
5 | TARGET_LINK_LIBRARIES(auth_mschap_v2 ${crypto_lib}) | |
6 | ||
7 | INSTALL(TARGETS auth_pap auth_chap_md5 auth_mschap_v1 auth_mschap_v2 | |
8 | - LIBRARY DESTINATION lib/accel-ppp | |
9 | + LIBRARY DESTINATION lib64/accel-ppp | |
10 | ) | |
11 | ||
12 | Tylko w accel-ppp-1.6.1.new/accel-pppd/auth: CMakeLists.txt~ | |
13 | diff -ur accel-ppp-1.6.1/accel-pppd/ctrl/l2tp/CMakeLists.txt accel-ppp-1.6.1.new/accel-pppd/ctrl/l2tp/CMakeLists.txt | |
14 | --- accel-ppp-1.6.1/accel-pppd/ctrl/l2tp/CMakeLists.txt 2012-03-20 06:43:40.000000000 +0100 | |
15 | +++ accel-ppp-1.6.1.new/accel-pppd/ctrl/l2tp/CMakeLists.txt 2012-04-17 15:08:47.786295511 +0200 | |
16 | @@ -10,7 +10,7 @@ | |
17 | ) | |
18 | #TARGET_LINK_LIBRARIES(l2tp nl nl-genl) | |
19 | ||
20 | -INSTALL(TARGETS l2tp LIBRARY DESTINATION lib/accel-ppp) | |
21 | +INSTALL(TARGETS l2tp LIBRARY DESTINATION lib64/accel-ppp) | |
22 | ||
23 | FILE(GLOB dict "${CMAKE_CURRENT_SOURCE_DIR}/dict/*") | |
24 | INSTALL(FILES ${dict} DESTINATION share/accel-ppp/l2tp) | |
25 | Tylko w accel-ppp-1.6.1.new/accel-pppd/ctrl/l2tp: CMakeLists.txt~ | |
26 | diff -ur accel-ppp-1.6.1/accel-pppd/ctrl/pppoe/CMakeLists.txt accel-ppp-1.6.1.new/accel-pppd/ctrl/pppoe/CMakeLists.txt | |
27 | --- accel-ppp-1.6.1/accel-pppd/ctrl/pppoe/CMakeLists.txt 2012-03-20 06:43:40.000000000 +0100 | |
28 | +++ accel-ppp-1.6.1.new/accel-pppd/ctrl/pppoe/CMakeLists.txt 2012-04-17 15:09:26.651469094 +0200 | |
29 | @@ -18,4 +18,4 @@ | |
30 | #set_property(TARGET pppoe PROPERTY INSTALL_RPATH_USE_LINK_PATH FALSE) | |
31 | #set_property(TARGET pppoe PROPERTY INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib/accel-ppp) | |
32 | ||
33 | -INSTALL(TARGETS pppoe LIBRARY DESTINATION lib/accel-ppp) | |
34 | +INSTALL(TARGETS pppoe LIBRARY DESTINATION lib64/accel-ppp) | |
35 | Tylko w accel-ppp-1.6.1.new/accel-pppd/ctrl/pppoe: CMakeLists.txt~ | |
36 | diff -ur accel-ppp-1.6.1/accel-pppd/ctrl/pptp/CMakeLists.txt accel-ppp-1.6.1.new/accel-pppd/ctrl/pptp/CMakeLists.txt | |
37 | --- accel-ppp-1.6.1/accel-pppd/ctrl/pptp/CMakeLists.txt 2012-03-20 06:43:40.000000000 +0100 | |
38 | +++ accel-ppp-1.6.1.new/accel-pppd/ctrl/pptp/CMakeLists.txt 2012-04-17 15:09:40.922144806 +0200 | |
39 | @@ -2,4 +2,4 @@ | |
40 | ||
41 | ADD_LIBRARY(pptp SHARED pptp.c) | |
42 | ||
43 | -INSTALL(TARGETS pptp LIBRARY DESTINATION lib/accel-ppp ) | |
44 | +INSTALL(TARGETS pptp LIBRARY DESTINATION lib64/accel-ppp ) | |
45 | Tylko w accel-ppp-1.6.1.new/accel-pppd/ctrl/pptp: CMakeLists.txt~ | |
46 | diff -ur accel-ppp-1.6.1/accel-pppd/extra/CMakeLists.txt accel-ppp-1.6.1.new/accel-pppd/extra/CMakeLists.txt | |
47 | --- accel-ppp-1.6.1/accel-pppd/extra/CMakeLists.txt 2012-03-20 06:43:40.000000000 +0100 | |
48 | +++ accel-ppp-1.6.1.new/accel-pppd/extra/CMakeLists.txt 2012-04-17 15:10:01.156436224 +0200 | |
49 | @@ -8,7 +8,7 @@ | |
50 | ADD_LIBRARY(connlimit SHARED connlimit.c) | |
51 | ||
52 | INSTALL(TARGETS pppd_compat ippool ipv6pool sigchld chap-secrets logwtmp connlimit | |
53 | - LIBRARY DESTINATION lib/accel-ppp | |
54 | + LIBRARY DESTINATION lib64/accel-ppp | |
55 | ) | |
56 | ||
57 | IF (SHAPER) | |
58 | @@ -18,7 +18,7 @@ | |
59 | SET_PROPERTY(TARGET shaper_tbf PROPERTY LINK_FLAGS "-L${LIBNL_PREFIX}/lib") | |
60 | ENDIF (LIBNL_PREFIX) | |
61 | TARGET_LINK_LIBRARIES(shaper_tbf nl m) | |
62 | - INSTALL(TARGETS shaper_tbf LIBRARY DESTINATION lib/accel-ppp) | |
63 | + INSTALL(TARGETS shaper_tbf LIBRARY DESTINATION lib64/accel-ppp) | |
64 | ENDIF (SHAPER) | |
65 | ||
66 | ||
67 | Tylko w accel-ppp-1.6.1.new/accel-pppd/extra: CMakeLists.txt~ | |
68 | diff -ur accel-ppp-1.6.1/accel-pppd/extra/net-snmp/CMakeLists.txt accel-ppp-1.6.1.new/accel-pppd/extra/net-snmp/CMakeLists.txt | |
69 | --- accel-ppp-1.6.1/accel-pppd/extra/net-snmp/CMakeLists.txt 2012-03-20 06:43:40.000000000 +0100 | |
70 | +++ accel-ppp-1.6.1.new/accel-pppd/extra/net-snmp/CMakeLists.txt 2012-04-17 15:10:16.977185330 +0200 | |
71 | @@ -25,5 +25,5 @@ | |
72 | ENDIF (NETSNMP_PREFIX) | |
73 | ||
74 | INSTALL(TARGETS net-snmp | |
75 | - LIBRARY DESTINATION lib/accel-ppp | |
76 | + LIBRARY DESTINATION lib64/accel-ppp | |
77 | ) | |
78 | Tylko w accel-ppp-1.6.1.new/accel-pppd/extra/net-snmp: CMakeLists.txt~ | |
79 | diff -ur accel-ppp-1.6.1/accel-pppd/ipv6/CMakeLists.txt accel-ppp-1.6.1.new/accel-pppd/ipv6/CMakeLists.txt | |
80 | --- accel-ppp-1.6.1/accel-pppd/ipv6/CMakeLists.txt 2012-03-20 06:43:40.000000000 +0100 | |
81 | +++ accel-ppp-1.6.1.new/accel-pppd/ipv6/CMakeLists.txt 2012-04-17 15:10:28.777744083 +0200 | |
82 | @@ -2,6 +2,6 @@ | |
83 | ADD_LIBRARY(ipv6_nd SHARED nd.c) | |
84 | ||
85 | INSTALL(TARGETS ipv6_dhcp ipv6_nd | |
86 | - LIBRARY DESTINATION lib/accel-ppp | |
87 | + LIBRARY DESTINATION lib64/accel-ppp | |
88 | ) | |
89 | ||
90 | Tylko w accel-ppp-1.6.1.new/accel-pppd/ipv6: CMakeLists.txt~ | |
91 | diff -ur accel-ppp-1.6.1/accel-pppd/logs/CMakeLists.txt accel-ppp-1.6.1.new/accel-pppd/logs/CMakeLists.txt | |
92 | --- accel-ppp-1.6.1/accel-pppd/logs/CMakeLists.txt 2012-03-20 06:43:40.000000000 +0100 | |
93 | +++ accel-ppp-1.6.1.new/accel-pppd/logs/CMakeLists.txt 2012-04-17 15:10:57.472436098 +0200 | |
94 | @@ -15,21 +15,21 @@ | |
95 | ADD_LIBRARY(log_file SHARED log_file.c) | |
96 | TARGET_LINK_LIBRARIES(log_file rt) | |
97 | INSTALL(TARGETS log_file | |
98 | - LIBRARY DESTINATION lib/accel-ppp | |
99 | + LIBRARY DESTINATION lib64/accel-ppp | |
100 | ) | |
101 | ENDIF(LOG_FILE) | |
102 | ||
103 | IF(LOG_TCP) | |
104 | ADD_LIBRARY(log_tcp SHARED log_tcp.c) | |
105 | INSTALL(TARGETS log_tcp | |
106 | - LIBRARY DESTINATION lib/accel-ppp | |
107 | + LIBRARY DESTINATION lib64/accel-ppp | |
108 | ) | |
109 | ENDIF(LOG_TCP) | |
110 | ||
111 | IF(LOG_SYSLOG) | |
112 | ADD_LIBRARY(log_syslog SHARED log_syslog.c) | |
113 | INSTALL(TARGETS log_syslog | |
114 | - LIBRARY DESTINATION lib/accel-ppp | |
115 | + LIBRARY DESTINATION lib64/accel-ppp | |
116 | ) | |
117 | ENDIF(LOG_SYSLOG) | |
118 | ||
119 | @@ -37,7 +37,7 @@ | |
120 | ADD_LIBRARY(log_pgsql SHARED log_pgsql.c) | |
121 | TARGET_LINK_LIBRARIES(log_pgsql pq) | |
122 | INSTALL(TARGETS log_pgsql | |
123 | - LIBRARY DESTINATION lib/accel-ppp | |
124 | + LIBRARY DESTINATION lib64/accel-ppp | |
125 | ) | |
126 | ENDIF(LOG_PGSQL) | |
127 | ||
128 | Tylko w accel-ppp-1.6.1.new/accel-pppd/logs: CMakeLists.txt~ | |
129 | diff -ur accel-ppp-1.6.1/accel-pppd/radius/CMakeLists.txt accel-ppp-1.6.1.new/accel-pppd/radius/CMakeLists.txt | |
130 | --- accel-ppp-1.6.1/accel-pppd/radius/CMakeLists.txt 2012-03-20 06:43:40.000000000 +0100 | |
131 | +++ accel-ppp-1.6.1.new/accel-pppd/radius/CMakeLists.txt 2012-04-17 15:11:14.459907114 +0200 | |
132 | @@ -15,7 +15,7 @@ | |
133 | ADD_LIBRARY(radius SHARED ${sources}) | |
134 | ||
135 | INSTALL(TARGETS radius | |
136 | - LIBRARY DESTINATION lib/accel-ppp | |
137 | + LIBRARY DESTINATION lib64/accel-ppp | |
138 | ) | |
139 | FILE(GLOB dict "${CMAKE_CURRENT_SOURCE_DIR}/dict/*") | |
140 | INSTALL(FILES ${dict} DESTINATION share/accel-ppp/radius) | |
141 | Tylko w accel-ppp-1.6.1.new/accel-pppd/radius: CMakeLists.txt~ | |
142 | diff -ur accel-ppp-1.6.1/accel-pppd/shaper/CMakeLists.txt accel-ppp-1.6.1.new/accel-pppd/shaper/CMakeLists.txt | |
143 | --- accel-ppp-1.6.1/accel-pppd/shaper/CMakeLists.txt 2012-03-20 06:43:40.000000000 +0100 | |
144 | +++ accel-ppp-1.6.1.new/accel-pppd/shaper/CMakeLists.txt 2012-04-17 15:11:24.817064190 +0200 | |
145 | @@ -1,6 +1,6 @@ | |
146 | ADD_LIBRARY(shaper SHARED shaper.c limiter.c tc_core.c libnetlink.c) | |
147 | ||
148 | INSTALL(TARGETS shaper | |
149 | - LIBRARY DESTINATION lib/accel-ppp | |
150 | + LIBRARY DESTINATION lib64/accel-ppp | |
151 | ) | |
152 | ||
153 | Tylko w accel-ppp-1.6.1.new/accel-pppd/shaper: CMakeLists.txt~ | |
154 | diff -ur accel-ppp-1.6.1/accel-pppd/triton/CMakeLists.txt accel-ppp-1.6.1.new/accel-pppd/triton/CMakeLists.txt | |
155 | --- accel-ppp-1.6.1/accel-pppd/triton/CMakeLists.txt 2012-03-20 06:43:40.000000000 +0100 | |
156 | +++ accel-ppp-1.6.1.new/accel-pppd/triton/CMakeLists.txt 2012-04-17 15:11:42.714578295 +0200 | |
157 | @@ -30,11 +30,11 @@ | |
158 | ||
159 | INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) | |
160 | ||
161 | -ADD_DEFINITIONS(-DMODULE_PATH="${CMAKE_INSTALL_PREFIX}/lib/accel-ppp") | |
162 | +ADD_DEFINITIONS(-DMODULE_PATH="${CMAKE_INSTALL_PREFIX}/lib64/accel-ppp") | |
163 | ||
164 | ADD_LIBRARY(triton SHARED ${sources_c}) | |
165 | TARGET_LINK_LIBRARIES(triton dl) | |
166 | ||
167 | INSTALL(TARGETS triton | |
168 | - LIBRARY DESTINATION lib/accel-ppp | |
169 | + LIBRARY DESTINATION lib64/accel-ppp | |
170 | ) | |
171 | Tylko w accel-ppp-1.6.1.new/accel-pppd/triton: CMakeLists.txt~ | |
172 | diff -ur accel-ppp-1.6.1/crypto/CMakeLists.txt accel-ppp-1.6.1.new/crypto/CMakeLists.txt | |
173 | --- accel-ppp-1.6.1/crypto/CMakeLists.txt 2012-03-20 06:43:40.000000000 +0100 | |
174 | +++ accel-ppp-1.6.1.new/crypto/CMakeLists.txt 2012-04-17 15:11:52.955063178 +0200 | |
175 | @@ -11,7 +11,7 @@ | |
176 | ADD_LIBRARY(internal-crypto SHARED ${sources}) | |
177 | ||
178 | INSTALL(TARGETS internal-crypto | |
179 | - LIBRARY DESTINATION lib/accel-ppp | |
180 | + LIBRARY DESTINATION lib64/accel-ppp | |
181 | ) | |
182 | ||
183 | ENDIF (CRYPTO STREQUAL INTERNAL) | |
184 | Tylko w accel-ppp-1.6.1.new/crypto: CMakeLists.txt~ |