[Cmake-commits] CMake branch, next, updated. v3.0.2-5497-g0df662b

[Rolf Eike Beer]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  0df662b7d88b6a17a2220817e9d2f178c13c279d (commit)
       via  33f031295c2bb8d652e4d5f8749e50ef24d7adb6 (commit)
      from  7dd7436d6323304bc9b838267a6f5c180434943b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0df662b7d88b6a17a2220817e9d2f178c13c279d
commit 0df662b7d88b6a17a2220817e9d2f178c13c279d
Merge: 7dd7436 33f0312
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Sep 29 12:25:59 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Sep 29 12:25:59 2014 -0400

    Merge topic 'GNUInstallDirs-typo' into next
    
    33f03129 Fix typo in Modules/GNUInstallDirs.cmake (#15176)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=33f031295c2bb8d652e4d5f8749e50ef24d7adb6
commit 33f031295c2bb8d652e4d5f8749e50ef24d7adb6
Author:     David Coppa <dcoppa at gmail.com>
AuthorDate: Mon Sep 29 12:19:12 2014 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Mon Sep 29 18:25:25 2014 +0200

    Fix typo in Modules/GNUInstallDirs.cmake (#15176)
    
    Commit d4fdd9c189f85d659f4294f8ec6da3e7e51215ec ("GNUInstallDirs: use the
    proper default for info and man paths on OpenBSD") introduced a typo.

diff --git a/Modules/GNUInstallDirs.cmake b/Modules/GNUInstallDirs.cmake
index eac553d..10956aa 100644
--- a/Modules/GNUInstallDirs.cmake
+++ b/Modules/GNUInstallDirs.cmake
@@ -198,7 +198,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
     set(CMAKE_INSTALL_INFODIR "info")
   endif()
 
-  if(NOT CMAKE_INSTALL_MANDDIR)
+  if(NOT CMAKE_INSTALL_MANDIR)
     set(CMAKE_INSTALL_MANDIR "" CACHE PATH "man documentation (man)")
     set(CMAKE_INSTALL_MANDIR "man")
   endif()
@@ -208,7 +208,7 @@ else()
     set(CMAKE_INSTALL_INFODIR "${CMAKE_INSTALL_DATAROOTDIR}/info")
   endif()
 
-  if(NOT CMAKE_INSTALL_MANDDIR)
+  if(NOT CMAKE_INSTALL_MANDIR)
     set(CMAKE_INSTALL_MANDIR "" CACHE PATH "man documentation (DATAROOTDIR/man)")
     set(CMAKE_INSTALL_MANDIR "${CMAKE_INSTALL_DATAROOTDIR}/man")
   endif()

-----------------------------------------------------------------------

Summary of changes:
 Modules/GNUInstallDirs.cmake |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake