On 03/23/2012 02:35 PM, Stephen Gallagher wrote:
On Fri, 2012-03-23 at 14:29 +0100, Pavel Březina wrote:
I've noticed that hbac_doc and libsss_sudo_doc is created during 'make
docs' but not installed nor cleaned afterwards.
This patch fixes it. It will treat every directory in SSSD_DOCS as a
documentation and automatically (un)install it.
Nack. Please update contrib/sssd.spec.in as well.
Updated.
From 74b90dbf822145d09b64df7b174d3296c44f2ba2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20B=C5=99ezina?= <pbrez...@redhat.com>
Date: Fri, 23 Mar 2012 14:23:58 +0100
Subject: [PATCH] Install and uninstall all documentation
Every directory listed in SSSD_DOCS in Makefile.am
will be installed as documentation.
---
Makefile.am | 21 ++++++++++++++++++---
contrib/sssd.spec.in | 6 ++++--
2 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index bdbfd48..3d60cba 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -404,6 +404,13 @@ if HAVE_NSS
dist_noinst_HEADERS += src/util/crypto/nss/nss_util.h
endif
+SSSD_DOCS = \
+ doc \
+ hbac_doc
+if BUILD_SUDO
+ SSSD_DOCS += libsss_sudo_doc
+endif
+
#####################
# Utility libraries #
#####################
@@ -1405,7 +1412,11 @@ if BUILD_PYTHON_BINDINGS
cd $(srcdir)/src/config; $(PYTHON) setup.py build --build-base $(abs_builddir)/src/config install $(DISTSETUPOPTS) --prefix=$(PYTHON_PREFIX) --root=$(DESTDIR) --record=$(abs_builddir)/src/config/.files; \
fi
endif
- mkdir -p doc $(DESTDIR)/$(docdir); cp -a doc $(DESTDIR)/$(docdir)/
+ mkdir -p doc $(DESTDIR)/$(docdir)
+ for doc in $(SSSD_DOCS); do \
+ cp -a $$doc $(DESTDIR)/$(docdir)/; \
+ done;
+
if HAVE_SYSTEMD_UNIT
mkdir -p $(DESTDIR)$(systemdunitdir)
else
@@ -1425,13 +1436,17 @@ uninstall-hook:
cat $(abs_builddir)/src/config/.files | xargs -iq rm -f $(DESTDIR)/q; \
rm $(abs_builddir)/src/config/.files ; \
fi
- rm -Rf $(DESTDIR)/$(docdir)/doc
+ for doc in $(SSSD_DOCS); do \
+ rm -Rf $(DESTDIR)/$(docdir)/$$doc; \
+ done;
clean-local:
if BUILD_PYTHON_BINDINGS
cd $(srcdir)/src/config; $(PYTHON) setup.py build --build-base $(abs_builddir)/src/config clean --all
endif
- rm -Rf doc
+ for doc in $(SSSD_DOCS); do \
+ rm -Rf $$doc; \
+ done;
rm -Rf ldb_mod_test_dir
CLEANFILES = *.X */*.X */*/*.X
diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in
index 40e68a6..e3c5901 100644
--- a/contrib/sssd.spec.in
+++ b/contrib/sssd.spec.in
@@ -258,6 +258,8 @@ find $RPM_BUILD_ROOT -name "*.la" -exec rm -f {} \;
# Suppress developer-only documentation
rm -Rf ${RPM_BUILD_ROOT}/%{_docdir}/%{name}/doc
+rm -Rf ${RPM_BUILD_ROOT}/%{_docdir}/%{name}/hbac_doc
+rm -Rf ${RPM_BUILD_ROOT}/%{_docdir}/%{name}/libsss_sudo_doc
# Older versions of rpmbuild can only handle one -f option
# So we need to append to the sssd.lang file
@@ -411,10 +413,10 @@ A utility library to allow communication between Autofs and SSSD
%files -n libsss_sudo-devel
%if 0%{?fedora}
-%doc hbac_doc/html
+%doc libsss_sudo_doc/html
%endif
%if 0%{?rhel} >= 6
-%doc hbac_doc/html
+%doc libsss_sudo_doc/html
%endif
%{_includedir}/sss_sudo.h
%{_libdir}/libsss_sudo.so
--
1.7.6.5
_______________________________________________
sssd-devel mailing list
sssd-devel@lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/sssd-devel
