From 6fb01537462a326a139f0c2d975145b26cd54bbe Mon Sep 17 00:00:00 2001 From: Thorsten Kukuk Date: Tue, 28 Sep 2004 13:48:45 +0000 Subject: Relevant BUGIDs: Purpose of commit: Commit summary: --------------- bugfix: * Merge patches from Red Hat (Bug 477000 and other - kukuk) * Fix pam_rhosts option parsing (Bug 922648 - kukuk) --- libpam/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'libpam') diff --git a/libpam/Makefile b/libpam/Makefile index 6728d635..2a55577f 100644 --- a/libpam/Makefile +++ b/libpam/Makefile @@ -97,7 +97,7 @@ bootdir: $(LIBPAM): $(DLIBOBJECTS) ifeq ($(DYNAMIC_LIBPAM),yes) ifeq ($(USESONAME),yes) - $(LD_L) $(SOSWITCH) $(LIBPAMNAME) -o $@ $(DLIBOBJECTS) \ + $(LD_L) $(SOSWITCH)$(LIBPAMNAME) -o $@ $(DLIBOBJECTS) \ $(MODULES) $(LINKLIBS) else $(LD_L) -o $@ $(DLIBOBJECTS) $(MODULES) $(LINKLIBS) @@ -112,9 +112,11 @@ endif $(LIBPAMSTATIC): $(SLIBOBJECTS) ifeq ($(STATIC_LIBPAM),yes) - $(AR) cr $@ $(SLIBOBJECTS) $(MODULES) + $(AR) cru $@ $(SLIBOBJECTS) $(MODULES) +ifdef RANLIB $(RANLIB) $@ endif +endif install: all $(MKDIR) $(FAKEROOT)$(INCLUDED) $(FAKEROOT)$(libdir) -- cgit v1.2.3