- updated to 2.8.12

[packages/cmake.git] / cmake-helpers.patch

diff --git a/cmake-helpers.patch b/cmake-helpers.patch
index 101756d29d824e4d526f5f513952b67925e345bf..dd7b5caa4d09c0125ca572a4594b3213dd83205e 100644 (file)
--- a/cmake-helpers.patch
+++ b/cmake-helpers.patch
@@ -1,16 +1,15 @@
---- a/Docs/bash-completion/CMakeLists.txt      2012-08-09 20:15:18.000000000 +0200
-+++ b/Docs/bash-completion/CMakeLists.txt      2012-08-15 13:46:38.124245369 +0200
+--- cmake-2.8.12/Docs/bash-completion/CMakeLists.txt.orig      2013-10-07 17:31:00.000000000 +0200
++++ cmake-2.8.12/Docs/bash-completion/CMakeLists.txt   2013-10-20 17:12:23.756481217 +0200
 @@ -5,4 +5,4 @@
  # add symlinks to the files in appropriate places
  #  /etc/bash_completion.d/
  #  DATADIR/completions (may be /usr/share/<package>/completions
--install(FILES cmake cpack ctest DESTINATION ${REL_CMAKE_DATA_DIR}/completions)
-+install(FILES cmake cpack ctest DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/bash_completion.d)
---- a/Docs/CMakeLists.txt      2012-08-09 20:15:18.000000000 +0200
-+++ b/Docs/CMakeLists.txt      2012-08-16 13:29:07.401201870 +0200
-@@ -1,4 +1,4 @@
- string(REGEX REPLACE "^/(.*)" "\\1" REL_CMAKE_DATA_DIR "${CMAKE_DATA_DIR}")
- install(FILES cmake-help.vim cmake-indent.vim cmake-syntax.vim DESTINATION ${REL_CMAKE_DATA_DIR}/editors/vim)
--install(FILES cmake-mode.el DESTINATION ${REL_CMAKE_DATA_DIR}/editors/emacs)
+-install(FILES cmake cpack ctest DESTINATION ${CMAKE_DATA_DIR}/completions)
++install(FILES cmake cpack ctest DESTINATION ${CMAKE_INSTALL_DATADIR}/bash-completion/completions)
+--- cmake-2.8.12/Docs/CMakeLists.txt.orig      2013-10-20 17:07:32.733160096 +0200
++++ cmake-2.8.12/Docs/CMakeLists.txt   2013-10-20 17:13:38.969811394 +0200
+@@ -1,3 +1,3 @@
+ install(FILES cmake-help.vim cmake-indent.vim cmake-syntax.vim DESTINATION ${CMAKE_DATA_DIR}/editors/vim)
+-install(FILES cmake-mode.el DESTINATION ${CMAKE_DATA_DIR}/editors/emacs)
 +install(FILES cmake-mode.el DESTINATION ${CMAKE_INSTALL_DATADIR}/emacs/site-lisp)
- ADD_SUBDIRECTORY (bash-completion)
+ add_subdirectory (bash-completion)