This fixes the build breakage we were seeing after the "SSH: Build man pages conditionally" patch.
The problem is that EXTRA_DIST was not evaluated properly at tarball creation time unless --with-ssh or --enable-all-experimental-features had been specified in the "configure" run that preceded 'make dist'. This was because EXTRA_DIST was composed of only those XML files that were specified by man_MANS during this run. We now always add all manpage XML files to the EXTRA_DIST variable so that they are always included in the tarball.
From 4fabb4bca7049609575b7d8f19d0b3ddbaeb6736 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher <[email protected]> Date: Wed, 15 Feb 2012 13:39:42 -0500 Subject: [PATCH] Always include all manpage XML files in the distribution tarball --- src/man/Makefile.am | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/man/Makefile.am b/src/man/Makefile.am index b84f66bb02bbf77f94c02582c0cad72bc5ebee23..9e569b4f0ae4fa22d5dc3876bf8ff64b57ac45f4 100644 --- a/src/man/Makefile.am +++ b/src/man/Makefile.am @@ -32,6 +32,7 @@ if HAVE_PROFILE_CATALOGS XSLTPROC_FLAGS += --stringparam profile.condition "$(CONDS)" endif +EXTRA_DIST = $(wildcard $(srcdir)/*.xml) $(wildcard $(srcdir)/include/*.xml) man_MANS = \ sss_useradd.8 sss_userdel.8 sss_usermod.8 \ sss_groupadd.8 sss_groupdel.8 sss_groupmod.8 \ @@ -39,10 +40,10 @@ man_MANS = \ sssd-krb5.5 sssd-ipa.5 sssd-simple.5 \ sssd_krb5_locator_plugin.8 sss_groupshow.8 \ pam_sss.8 sss_obfuscate.8 sss_cache.8 sss_debuglevel.8 + if BUILD_SSH - man_MANS += sss_ssh_authorizedkeys.1 sss_ssh_knownhostsproxy.1 +man_MANS += sss_ssh_authorizedkeys.1 sss_ssh_knownhostsproxy.1 endif -EXTRA_DIST = $(man_MANS:%=%.xml) $(wildcard $(srcdir)/include/*.xml) SUFFIXES = .1.xml .1 .3.xml .3 .5.xml .5 .8.xml .8 .1.xml.1: -- 1.7.7.6
signature.asc
Description: This is a digitally signed message part
_______________________________________________ sssd-devel mailing list [email protected] https://fedorahosted.org/mailman/listinfo/sssd-devel
