diff options
| -rw-r--r-- | Makefile.am | 22 | ||||
| -rw-r--r-- | contrib/sssd.spec.in | 6 |
2 files changed, 22 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index 8293c08e..72479024 100644 --- a/Makefile.am +++ b/Makefile.am @@ -409,6 +409,14 @@ if HAVE_NSS dist_noinst_HEADERS += src/util/crypto/nss/nss_util.h endif +SSSD_DOCS = \ + doc \ + hbac_doc \ + idmap_doc +if BUILD_SUDO + SSSD_DOCS += libsss_sudo_doc +endif + ##################### # Utility libraries # ##################### @@ -1420,7 +1428,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)/ + for doc in $(SSSD_DOCS); do \ + mkdir -p $$doc $(DESTDIR)/$(docdir); \ + cp -a $$doc $(DESTDIR)/$(docdir)/; \ + done; + if HAVE_SYSTEMD_UNIT mkdir -p $(DESTDIR)$(systemdunitdir) else @@ -1440,13 +1452,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 d3f0d08f..43beca52 100644 --- a/contrib/sssd.spec.in +++ b/contrib/sssd.spec.in @@ -275,7 +275,7 @@ install -m644 src/examples/rwtab $RPM_BUILD_ROOT%{_sysconfdir}/rwtab.d/sssd 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} # Older versions of rpmbuild can only handle one -f option # So we need to append to the sssd.lang file @@ -446,10 +446,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 |