diff --git a/nsprpub/lib/msgc/tests/Makefile b/nsprpub/lib/msgc/tests/Makefile
index e3f4b1c7f3dd..d31816599f6a 100644
--- a/nsprpub/lib/msgc/tests/Makefile
+++ b/nsprpub/lib/msgc/tests/Makefile
@@ -110,11 +110,7 @@ endif
 
 # AIX
 ifeq ($(OS_ARCH),AIX)
-ifeq ($(CLASSIC_NSPR),1)
-LDOPTS += -blibpath:.:$(PWD)/$(DIST)/lib:/usr/lpp/xlC/lib:/usr/lib:/lib
-else
-LDOPTS += -blibpath:.:$(PWD)/$(DIST)/lib:/usr/lib/threads:/usr/lpp/xlC/lib:/usr/lib:/lib
-endif
+LDOPTS += -blibpath:$(PWD)/$(DIST)/lib:/usr/lib:/lib
 ifeq ($(OS_ARCH)$(OS_RELEASE),AIX4.1)
 LIBPR = -lnspr$(NSPR_VERSION)_shr
 LIBPLC = -lplc$(NSPR_VERSION)_shr
diff --git a/nsprpub/lib/prstreams/Makefile b/nsprpub/lib/prstreams/Makefile
index 1cfaef52fcb9..706de958a6db 100644
--- a/nsprpub/lib/prstreams/Makefile
+++ b/nsprpub/lib/prstreams/Makefile
@@ -70,10 +70,12 @@ else
             OS_LIBS += -lC_r -lc_r
         endif
       else
+        # makeC++SharedLib(_r) is in either /usr/lpp/xlC/bin
+        # or /usr/ibmcxx/bin.
         ifeq ($(CLASSIC_NSPR),1)
-            MKSHLIB = /usr/lpp/xlC/bin/makeC++SharedLib -p 0
+            MKSHLIB = makeC++SharedLib -p 0
         else
-            MKSHLIB = /usr/lpp/xlC/bin/makeC++SharedLib_r -p 0
+            MKSHLIB = makeC++SharedLib_r -p 0
         endif
         OS_LIBS += -ldl
       endif
diff --git a/nsprpub/lib/prstreams/tests/testprstrm/Makefile b/nsprpub/lib/prstreams/tests/testprstrm/Makefile
index f17cb0d45ad3..64b0ceedce6d 100644
--- a/nsprpub/lib/prstreams/tests/testprstrm/Makefile
+++ b/nsprpub/lib/prstreams/tests/testprstrm/Makefile
@@ -78,11 +78,7 @@ endif
 
 # AIX
 ifeq ($(OS_ARCH),AIX)
-ifeq ($(CLASSIC_NSPR),1)
-LDOPTS += -blibpath:.:$(PWD)/$(DIST)/lib:/usr/lpp/xlC/lib:/usr/lib:/lib
-else
-LDOPTS += -blibpath:.:$(PWD)/$(DIST)/lib:/usr/lib/threads:/usr/lpp/xlC/lib:/usr/lib:/lib                                        
-endif
+LDOPTS += -blibpath:$(PWD)/$(DIST)/lib:/usr/lib:/lib
 ifeq ($(OS_ARCH)$(OS_RELEASE),AIX4.1)
 LIBPR = -lnspr$(MOD_VERSION)_shr
 LIBPRSTRMS = -lprstrms$(MOD_VERSION)_shr
diff --git a/nsprpub/lib/tests/Makefile b/nsprpub/lib/tests/Makefile
index bc9efd424fc5..61f88a584530 100644
--- a/nsprpub/lib/tests/Makefile
+++ b/nsprpub/lib/tests/Makefile
@@ -76,7 +76,7 @@ endif
 
 # AIX
 ifeq ($(OS_ARCH),AIX)
-LDOPTS += -blibpath:.:$(PWD)/$(DIST)/lib:/usr/lib/threads:/usr/lpp/xlC/lib:/usr/lib:/lib                                        
+LDOPTS += -blibpath:$(PWD)/$(DIST)/lib:/usr/lib:/lib
 LIBPR = -lnspr$(MOD_VERSION)_shr
 LIBPLC = -lplc$(MOD_VERSION)_shr
 endif
diff --git a/nsprpub/pr/src/cplus/tests/Makefile b/nsprpub/pr/src/cplus/tests/Makefile
index f761001da57c..32a65373b4d7 100644
--- a/nsprpub/pr/src/cplus/tests/Makefile
+++ b/nsprpub/pr/src/cplus/tests/Makefile
@@ -126,11 +126,7 @@ endif
 
 # AIX
 ifeq ($(OS_ARCH),AIX)
-    ifeq ($(CLASSIC_NSPR),1)
-        LDOPTS += -blibpath:.:$(PWD)/$(DIST)/lib:/usr/lpp/xlC/lib:/usr/lib:/lib
-    else
-        LDOPTS += -blibpath:.:$(PWD)/$(DIST)/lib:/usr/lib/threads:/usr/lpp/xlC/lib:/usr/lib:/lib
-    endif
+    LDOPTS += -blibpath:$(PWD)/$(DIST)/lib:/usr/lib:/lib
     ifeq ($(OS_ARCH)$(OS_RELEASE),AIX4.1)
         LIBPR = -lnspr$(MOD_VERSION)_shr
         LIBPLC = -lplc$(MOD_VERSION)_shr
diff --git a/nsprpub/pr/tests/Makefile b/nsprpub/pr/tests/Makefile
index 90f6d8d93f52..c66c5216930f 100644
--- a/nsprpub/pr/tests/Makefile
+++ b/nsprpub/pr/tests/Makefile
@@ -230,11 +230,7 @@ endif
 
 # AIX
 ifeq ($(OS_ARCH),AIX)
-    ifeq ($(CLASSIC_NSPR),1)
-        LDOPTS += -blibpath:.:$(PWD)/$(DIST)/lib:/usr/lpp/xlC/lib:/usr/lib:/lib
-    else
-        LDOPTS += -blibpath:.:$(PWD)/$(DIST)/lib:/usr/lib/threads:/usr/lpp/xlC/lib:/usr/lib:/lib
-    endif
+    LDOPTS += -blibpath:$(PWD)/$(DIST)/lib:/usr/lib:/lib
     ifeq ($(OS_ARCH)$(OS_RELEASE),AIX4.1)
         LIBPR = -lnspr$(MOD_VERSION)_shr
         LIBPLC = -lplc$(MOD_VERSION)_shr
diff --git a/nsprpub/tools/Makefile b/nsprpub/tools/Makefile
index 8477d86620fb..cb29c4fafd5a 100644
--- a/nsprpub/tools/Makefile
+++ b/nsprpub/tools/Makefile
@@ -82,7 +82,7 @@ endif
 
 # AIX
 ifeq ($(OS_ARCH),AIX)
-LDOPTS += -blibpath:.:$(PWD)/$(DIST)/lib:/usr/lib/threads:/usr/lpp/xlC/lib:/usr/lib:/lib                                        
+LDOPTS += -blibpath:$(PWD)/$(DIST)/lib:/usr/lib:/lib
 LIBPR = -lnspr$(NSPR_VERSION)_shr
 LIBPLC = -lplc$(NSPR_VERSION)_shr
 endif