[icinga-checkins] icinga.org: icinga2/feature/cmake-4962: Install missing files.

git at icinga.org git at icinga.org
Sat Nov 2 17:51:10 CET 2013


Module: icinga2
Branch: feature/cmake-4962
Commit: bc5babf811d5f55e22d4451efacc60410b3caf29
URL:    https://git.icinga.org/?p=icinga2.git;a=commit;h=bc5babf811d5f55e22d4451efacc60410b3caf29

Author: Gunnar Beutner <gunnar at beutner.name>
Date:   Sat Nov  2 17:44:38 2013 +0100

Install missing files.

Refs #4962

---

 doc/CMakeLists.txt   |    7 +++++++
 icinga2.spec         |    2 +-
 tools/CMakeLists.txt |    7 +++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index a03b99c..5727d7e 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -19,3 +19,10 @@ install(
   DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
   DESTINATION ${CMAKE_INSTALL_DOCDIR}  FILES_MATCHING PATTERN *.md
 )
+
+if(UNIX OR CYGWIN)
+  install(
+    FILES icinga2.8
+    DESTINATION ${CMAKE_INSTALL_MANDIR}/man8
+  )
+endif()
\ No newline at end of file
diff --git a/icinga2.spec b/icinga2.spec
index 074d5c9..6e6b64f 100644
--- a/icinga2.spec
+++ b/icinga2.spec
@@ -252,7 +252,7 @@ fi
 %{_libdir}/%{name}
 %{_datadir}/%{name}
 %exclude %{_datadir}/%{name}/itl
-%{_mandir}/man8/%{name}.8.gz
+%{_mandir}/man8/%{name}.8
 
 %attr(0755,%{icinga_user},%{icinga_group}) %{_localstatedir}/cache/%{name}
 %attr(0755,%{icinga_user},%{icinga_group}) %dir %{_localstatedir}/log/%{name}
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index b919898..d048c7a 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -26,4 +26,11 @@ if(UNIX OR CYGWIN)
     DESTINATION ${CMAKE_INSTALL_SBINDIR}
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
   )
+
+  install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink ./icinga2-enable-feature \"\$ENV{DESTDIR}${CMAKE_INSTALL_SBINDIR}/icinga2-enable-feature\")")
+
+  install(
+    FILES ${CMAKE_CURRENT_SOURCE_DIR}/migration/icinga2-migrate-config
+    DESTINATION ${CMAKE_INSTALL_BINDIR}
+  )
 endif()
\ No newline at end of file





More information about the icinga-checkins mailing list