[SCM] pam wrapper repository - branch master updated

[Andreas Schneider]

The branch, master has been updated
       via  6bfbb27 Bump version to 1.1.2
       via  55c08e2 doc: Fix manpage installation
      from  4ef299e Bump version to 1.1.1

https://git.samba.org/?p=pam_wrapper.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 6bfbb2772c7dd08ef3b52456b3fc01768fc139e8
Author: Andreas Schneider <asn at samba.org>
Date:   Tue Mar 24 14:30:35 2020 +0100

    Bump version to 1.1.2
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Alexander Bokovoy <ab at samba.org>

commit 55c08e27436adfe89d09d5ffa129ed5e9e581ee3
Author: Andreas Schneider <asn at samba.org>
Date:   Tue Mar 24 14:29:06 2020 +0100

    doc: Fix manpage installation
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Alexander Bokovoy <ab at samba.org>

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

Summary of changes:
 CHANGELOG          |  3 +++
 CMakeLists.txt     |  2 +-
 doc/CMakeLists.txt | 10 +++++-----
 3 files changed, 9 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/CHANGELOG b/CHANGELOG
index 86bdfb4..f72b8ad 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,9 @@
 ChangeLog
 ==========
 
+version 1.1.2 (released 2020-03-24)
+  * Fix manpage installation
+
 version 1.1.1 (released 2020-03-24)
   * Fixed pam_wrapper on Ubuntu
   * Improved PAM detection for openSUSE Tumbleweed
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c5ff40b..a95e8f7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,7 +11,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules")
 include(DefineCMakeDefaults)
 include(DefineCompilerFlags)
 
-project(pam_wrapper VERSION 1.1.1 LANGUAGES C)
+project(pam_wrapper VERSION 1.1.2 LANGUAGES C)
 
 # global needed variables
 set(APPLICATION_NAME ${PROJECT_NAME})
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 8a8e60a..498da5e 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1,27 +1,27 @@
 install(FILES
             pam_wrapper.1
         DESTINATION
-            ${MAN_INSTALL_DIR}/man1)
+            ${CMAKE_INSTALL_MANDIR}/man1)
 
 install(FILES
             pam_matrix.8
         DESTINATION
-            ${MAN_INSTALL_DIR}/man8)
+            ${CMAKE_INSTALL_MANDIR}/man8)
 
 install(FILES
             pam_chatty.8
         DESTINATION
-            ${MAN_INSTALL_DIR}/man8)
+            ${CMAKE_INSTALL_MANDIR}/man8)
 
 install(FILES
             pam_get_items.8
         DESTINATION
-            ${MAN_INSTALL_DIR}/man8)
+            ${CMAKE_INSTALL_MANDIR}/man8)
 
 install(FILES
             pam_set_items.8
         DESTINATION
-            ${MAN_INSTALL_DIR}/man8)
+            ${CMAKE_INSTALL_MANDIR}/man8)
 
 #
 # Build the documentation


-- 
pam wrapper repository