--- Linux-PAM-0.78/libpamc/Makefile.org	2006-05-16 00:52:15.000000000 +0200
+++ Linux-PAM-0.78/libpamc/Makefile.org	2006-05-16 00:54:43.000000000 +0200
@@ -87,8 +87,6 @@ 
 	$(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) )
--- Linux-PAM-0.78/libpam_misc/Makefile.org	2006-05-16 00:49:43.000000000 +0200
+++ Linux-PAM-0.78/libpam_misc/Makefile.org	2006-05-16 00:50:14.000000000 +0200
@@ -89,8 +89,6 @@ 
 	$(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) )
--- Linux-PAM-0.78/libpam/Makefile.org	2006-05-16 00:15:13.000000000 +0200
+++ Linux-PAM-0.78/libpam/Makefile.org	2006-05-16 00:17:22.000000000 +0200
@@ -132,8 +132,6 @@ 
 	$(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) ; \
--- Linux-PAM-0.78/configure.in.org	2006-05-15 19:21:09.000000000 +0200
+++ Linux-PAM-0.78/configure.in.org	2006-05-15 19:21:15.000000000 +0200
@@ -308,7 +308,7 @@ 
 	-Wnested-externs -Winline -Wshadow"
 
 if test "$GCC" = yes; then
-	CC=gcc				; AC_SUBST(CC)
+	AC_SUBST(CC)
 ### May need per-OS attention
 ### Example: -D_POSIX_SOURCE: needed on Linux but harms Solaris.
 	case $OS in
@@ -318,10 +318,10 @@ 
 		WARNINGS="$GCC_WARNINGS"
 		PIC="-fPIC"
 		DYNTYPE=so
-		LD=gcc
+		LD="$CC"
 		LD_L="$CC -shared $LDFLAGS"
 		RANLIB=:
-		STRIP=strip
+		STRIP=${CHOST}-strip
 		CC_STATIC="-Xlinker -export-dynamic"
 		;;
 	sunos)