1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
|
Description: Adjust intalled files and paths
* Arpon is installed to /usr/sbin (not /sbin) in Debian.
* Log file gets placed in a separate folder for logrotate.
* Do not install empty log file and pidfile, will be created dynamically on
daemon startup.
* Doc directory has been cleaned to be DFSG conform, disabled in Cmake.
Author: Lukas Schwaighofer <lukas@schwaighofer.name>
Forwarded: not-needed
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -30,12 +30,12 @@
#
if(${CMAKE_INSTALL_PREFIX} STREQUAL "/")
- set(ARPON_SBIN /sbin/arpon)
+ set(ARPON_SBIN /usr/sbin/arpon)
set(ARPON_DOC /usr/share/doc/arpon/index.html)
set(ARPON_ETC /etc/arpon.conf)
- set(ARPON_LOG /var/log/arpon.log)
+ set(ARPON_LOG /var/log/arpon/arpon.log)
set(ARPON_PID /var/run/arpon.pid)
- set(install_prefix /sbin)
+ set(install_prefix /usr/sbin)
else(${CMAKE_INSTALL_PREFIX} STREQUAL "/")
set(ARPON_SBIN ${CMAKE_INSTALL_PREFIX}/sbin/arpon)
set(ARPON_DOC ${CMAKE_INSTALL_PREFIX}/share/doc/arpon/index.html)
--- a/log/CMakeLists.txt
+++ b/log/CMakeLists.txt
@@ -33,7 +33,7 @@
if(${CMAKE_INSTALL_PREFIX} STREQUAL "/")
install(FILES ${arpon_log_src}
- DESTINATION /var/log
+ DESTINATION /var/log/arpon
PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ
COMPONENT Log)
else(${CMAKE_INSTALL_PREFIX} STREQUAL "/")
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -115,11 +115,11 @@
endif(cmake_build_type_tolower STREQUAL "debug")
add_subdirectory(src)
-add_subdirectory(doc)
+#add_subdirectory(doc)
add_subdirectory(man8)
add_subdirectory(etc)
-add_subdirectory(log)
-add_subdirectory(run)
+#add_subdirectory(log)
+#add_subdirectory(run)
configure_file(
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/scripts/cmake_uninstall.cmake.in"
|
