Relevant BUGIDs: 850092

Purpose of commit: bugfix

Commit summary:
---------------
Using the fakeroot option as normal user does not work, since
we call ldconfig, which aborts with an error message if not
called  as root due missing permissions.
Fixed by calling ldconfig with -n library path option if FAKEROOT
is set.

diff --git a/libpam/Makefile b/libpam/Makefile
index e2b9649ef1a9928f399b8d55c366a0c598d0b58e..6728d63597a787a0471b0b7d12f36b9da0190d82 100644 (file)
--- a/libpam/Makefile
+++ b/libpam/Makefile
@@ -128,7 +128,11 @@ ifdef MEMORY_DEBUG
 endif
 ifeq ($(DYNAMIC_LIBPAM),yes)
        $(INSTALL) -m $(SHLIBMODE) $(LIBPAM) $(FAKEROOT)$(libdir)/$(LIBPAMFULL)
+ifndef FAKEROOT
        $(LDCONFIG)
+else
+       $(LDCONFIG) -n $(FAKEROOT)$(libdir)
+endif
   ifneq ($(DYNTYPE),"sl")
        ( cd $(FAKEROOT)$(libdir) ; rm -f $(LIBPAM) ; \
          ln -sf $(LIBPAMNAME) $(LIBPAM) )
@@ -146,7 +150,9 @@ remove:
        rm -f $(FAKEROOT)$(INCLUDED)/pam_malloc.h
        rm -f $(FAKEROOT)$(libdir)/$(LIBPAM).*
        rm -f $(FAKEROOT)$(libdir)/$(LIBPAM)
+ifndef FAKEROOT
        $(LDCONFIG)
+endif
        rm -f $(FAKEROOT)$(libdir)/$(LIBPAMSTATIC)
 
 clean:

diff --git a/libpam_misc/Makefile b/libpam_misc/Makefile
index e9b1a6c19cb798cd8384f8016867f02eb84b17fe..16ba07e6f916cea5fffe8eff0524f4a44f9fadc1 100644 (file)
--- a/libpam_misc/Makefile
+++ b/libpam_misc/Makefile
@@ -84,7 +84,11 @@ install: all
 ifeq ($(DYNAMIC_LIBPAM),yes)
        $(MKDIR) $(FAKEROOT)$(libdir)
        $(INSTALL) -m $(SHLIBMODE) $(LIBNAMED) $(FAKEROOT)$(libdir)/$(LIBNAMEDFULL)
+ifndef FAKEROOT
        $(LDCONFIG)
+else
+       $(LDCONFIG) -n $(FAKEROOT)$(libdir)
+endif
   ifneq ($(DYNTYPE),"sl")
        ( cd $(FAKEROOT)$(libdir) ; rm -f $(LIBNAMED) ; ln -s $(LIBNAMEDNAME) $(LIBNAMED) )
   endif

diff --git a/libpamc/Makefile b/libpamc/Makefile
index 45d4205106ea3e490ea838d1574d0285e90c053a..49befe4b7ffb8c30e43e9804d4e57ea4c1f1768d 100644 (file)
--- a/libpamc/Makefile
+++ b/libpamc/Makefile
@@ -83,7 +83,11 @@ install: all
 ifeq ($(DYNAMIC_LIBPAM),yes)
        $(MKDIR) $(FAKEROOT)$(libdir)
        $(INSTALL) -m $(SHLIBMODE) $(LIBNAMED) $(FAKEROOT)$(libdir)/$(LIBNAMEDFULL)
+ifndef FAKEROOT
        $(LDCONFIG)
+else
+       $(LDCONFIG) -n $(FAKEROOT)$(libdir)
+endif
   ifneq ($(DYNTYPE),"sl")
        ( cd $(FAKEROOT)$(libdir) ; rm -f $(LIBNAMED) ; ln -s $(LIBNAMEDNAME) $(LIBNAMED) )
   endif