nss-pam-ldapd branch master updated. 0.9.0-1-gb5b4239

[Commits of the nss-pam-ldapd project <nss-pam-ldapd-commits [at] lists.arthurdejong.org>]

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 "nss-pam-ldapd".

The branch, master has been updated
       via  b5b423962a894465f6f9e801c093162c8f39aefd (commit)
      from  187c626daac51ae1d6ce100930e61612650719c8 (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://arthurdejong.org/git/nss-pam-ldapd/commit/?id=b5b423962a894465f6f9e801c093162c8f39aefd

commit b5b423962a894465f6f9e801c093162c8f39aefd
Author: Arthur de Jong <arthur@arthurdejong.org>
Date:   Sat Apr 6 13:53:51 2013 +0200

    Fix the way manual pages are installed
    
    The :u flag apparently isn't portable across versions of make and automake
    rules complain if a manual page is added twice to a target.

diff --git a/man/Makefile.am b/man/Makefile.am
index 5b8d7f4..bb186bf 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -20,24 +20,26 @@
 PAM_MANS = pam_ldap.8
 UTILS_MANS = getent.ldap.1 chsh.ldap.1
 NSLCD_MANS = nslcd.conf.5 nslcd.8
-PYNSLCD_MANS = nslcd.conf.5 pynslcd.8
+PYNSLCD_MANS = pynslcd.8
 ALL_MANS = $(PAM_MANS) $(UTILS_MANS) $(NSLCD_MANS) $(PYNSLCD_MANS)
 
 # figure out which manual pages to install
-INST_MANS =
+man_MANS =
 if ENABLE_PAM
-  INST_MANS += $(PAM_MANS)
+  man_MANS += $(PAM_MANS)
 endif
 if ENABLE_UTILS
-  INST_MANS += $(UTILS_MANS)
+  man_MANS += $(UTILS_MANS)
 endif
 if ENABLE_NSLCD
-  INST_MANS += $(NSLCD_MANS)
+  man_MANS += $(NSLCD_MANS)
 endif
 if ENABLE_PYNSLCD
-  INST_MANS += $(PYNSLCD_MANS)
+  man_MANS += $(PYNSLCD_MANS)
+if !ENABLE_NSLCD
+  man_MANS += nslcd.conf.5
+endif
 endif
-man_MANS = $(INST_MANS:u)
 noinst_DATA = $(ALL_MANS)
 EXTRA_DIST = $(ALL_MANS) $(ALL_MANS:=.xml)
 

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

Summary of changes:
 man/Makefile.am |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
nss-pam-ldapd
-- 
To unsubscribe send an email to
nss-pam-ldapd-commits-unsubscribe@lists.arthurdejong.org or see
http://lists.arthurdejong.org/nss-pam-ldapd-commits/