summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--PKGBUILD1
-rw-r--r--cmake_path.diff6
2 files changed, 3 insertions, 4 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 552279c0af1d..9705915f0f3a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,7 +16,6 @@ sha1sums=('SKIP')
prepare() {
cd "${srcdir}/${pkgname}"
patch < ../../cmake_path.diff
- sed -i "/.*init.d\/)$/d" CMakeLists.txt
}
build() {
diff --git a/cmake_path.diff b/cmake_path.diff
index 332b390f2eb7..a93ec27726ef 100644
--- a/cmake_path.diff
+++ b/cmake_path.diff
@@ -1,14 +1,14 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c2bbdfc..00c4ed3 100644
+index c2bbdfc..85ee7f6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -34,10 +34,10 @@ target_link_libraries(lapdog oping)
+@@ -34,10 +34,9 @@ target_link_libraries(lapdog oping)
SET(CMAKE_CXX_FLAGS "-std=c++0x")
-install(TARGETS lapdog RUNTIME DESTINATION /usr/sbin/)
+-install(PROGRAMS init/lapdog DESTINATION /etc/init.d/)
+install(TARGETS lapdog RUNTIME DESTINATION /usr/bin/)
- install(PROGRAMS init/lapdog DESTINATION /etc/init.d/)
install(FILES doc/lapdog.conf DESTINATION /etc/ COMPONENT config)
install(FILES doc/device.conf DESTINATION /etc/lapdog/ COMPONENT config)
-install(FILES init/lapdog.service DESTINATION /lib/systemd/system/ COMPONENT config)