From 36244ac1ff6670667922be5ea0261d86df9ef120 Mon Sep 17 00:00:00 2001 From: Serge Hallyn Date: Sat, 24 Mar 2018 23:41:23 -0500 Subject: [PATCH] src/Makefile.am: tcb fixes from mandriva 1. suidubins -= was breaking build with WITH_TCB. 2. stick libtcb at end of ldlibs list. Signed-off-by: Serge Hallyn --- src/Makefile.am | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index b5f09caa..3c98a8d3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -53,7 +53,10 @@ usbin_PROGRAMS = \ noinst_PROGRAMS = id sulogin suidbins = su -suidubins = chage chfn chsh expiry gpasswd newgrp passwd +suidubins = chage chfn chsh expiry gpasswd newgrp +if !WITH_TCB +suidubins += passwd +endif if ACCT_TOOLS_SETUID suidubins += chgpasswd chpasswd groupadd groupdel groupmod newusers useradd userdel usermod endif @@ -62,14 +65,13 @@ suidubins += newgidmap newuidmap endif if WITH_TCB -suidubins -= passwd shadowsgidubins = passwd endif LDADD = $(INTLLIBS) \ - $(LIBTCB) \ $(top_builddir)/libmisc/libmisc.a \ - $(top_builddir)/lib/libshadow.la + $(top_builddir)/lib/libshadow.la \ + $(LIBTCB) if ACCT_TOOLS_SETUID LIBPAM_SUID = $(LIBPAM)