[icinga-checkins] icinga.org: icinga2/next: Correct wrong file move

git at icinga.org git at icinga.org
Fri Jun 13 21:44:09 CEST 2014


Module: icinga2
Branch: next
Commit: 51a889d0196ed20361700988c646b761ae52da0b
URL:    https://git.icinga.org/?p=icinga2.git;a=commit;h=51a889d0196ed20361700988c646b761ae52da0b

Author: Michael Friedrich <michael.friedrich at gmail.com>
Date:   Fri Jun 13 20:31:30 2014 +0200

Correct wrong file move

refs #6481

---

 contrib/CMakeLists.txt                          |    1 -
 tools/CMakeLists.txt                            |    1 +
 {contrib => tools}/icinga2-enable-feature.cmake |    0
 3 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt
index 7724930..fcd9c9a 100644
--- a/contrib/CMakeLists.txt
+++ b/contrib/CMakeLists.txt
@@ -16,7 +16,6 @@
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
 if(UNIX OR CYGWIN)
-  configure_file(icinga2-enable-feature.cmake ${CMAKE_CURRENT_BINARY_DIR}/icinga2-enable-feature @ONLY)
   configure_file(icinga2-discover-agent.cmake ${CMAKE_CURRENT_BINARY_DIR}/icinga2-discover-agent @ONLY)
   configure_file(icinga2-forget-agent.cmake ${CMAKE_CURRENT_BINARY_DIR}/icinga2-forget-agent @ONLY)
   configure_file(icinga2-list-agents.cmake ${CMAKE_CURRENT_BINARY_DIR}/icinga2-list-agents @ONLY)
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 370894a..d5fca23 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -19,5 +19,6 @@ add_subdirectory(mkclass)
 add_subdirectory(mkembedconfig)
 
 if(UNIX OR CYGWIN)
+  configure_file(icinga2-enable-feature.cmake ${CMAKE_CURRENT_BINARY_DIR}/icinga2-enable-feature @ONLY)
   install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink ./icinga2-enable-feature \"\$ENV{DESTDIR}${CMAKE_INSTALL_FULL_SBINDIR}/icinga2-disable-feature\")")
 endif()
diff --git a/contrib/icinga2-enable-feature.cmake b/tools/icinga2-enable-feature.cmake
similarity index 100%
rename from contrib/icinga2-enable-feature.cmake
rename to tools/icinga2-enable-feature.cmake



More information about the icinga-checkins mailing list