From 30b240137ea5c8e6927b9a4f93813735a2a477ae Mon Sep 17 00:00:00 2001 From: Sorah Fukumori Date: Sun, 23 Oct 2016 01:43:05 +0900 Subject: [PATCH 05/39] BUILD: Fix installation without samba MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit winbindplugindir is defined only when BUILD_SAMBA is on. Also the file doesn't exist when BUILD_SAMBA is off, so installation will fail. Reviewed-by: Fabiano Fidêncio Reviewed-by: Lukáš Slebodník (cherry picked from commit 13adcd07000ba3ca1422c6ee863df17d70e2b14c) (cherry picked from commit 1fb3cccd83ede1bbe99319254c88fce1285b352d) --- Makefile.am | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile.am b/Makefile.am index 3d3500918..d08e39fa4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4130,7 +4130,9 @@ install-data-hook: if [ ! $(krb5rcachedir) = "__LIBKRB5_DEFAULTS__" ]; then \ $(MKDIR_P) $(DESTDIR)/$(krb5rcachedir) ; \ fi +if BUILD_SAMBA mv $(DESTDIR)/$(winbindplugindir)/winbind_idmap_sss.so $(DESTDIR)/$(winbindplugindir)/sss.so +endif uninstall-hook: if [ -f $(abs_builddir)/src/config/.files2 ]; then \ @@ -4152,7 +4154,9 @@ if BUILD_PYTHON3_BINDINGS cd $(DESTDIR)$(py3execdir) && \ rm -f pysss.so pyhbac.so pysss_murmur.so pysss_nss_idmap.so endif +if BUILD_SAMBA rm $(DESTDIR)/$(winbindplugindir)/sss.so +endif clean-local: if BUILD_PYTHON2_BINDINGS -- 2.11.0