diff options
| author | wtc%netscape.com <devnull@localhost> | 1999-01-08 19:51:14 +0000 |
|---|---|---|
| committer | wtc%netscape.com <devnull@localhost> | 1999-01-08 19:51:14 +0000 |
| commit | 406d0aea11fcc1582068c876c6465b7279e724c5 (patch) | |
| tree | eca7d9513de9fe8997f98449cf8b30d95bcb69fd | |
| parent | 3c2ed584a35520e9345ed7c9d02ebc290a0f9c8a (diff) | |
| download | nspr-hg-406d0aea11fcc1582068c876c6465b7279e724c5.tar.gz | |
Removed hardcoded AIX pathnames /usr/lpp/xlC from the makefiles,
because the new version of AIX xlC compilers (3.6.4) is installed
in a different directory (/usr/ibmcxx).
| -rw-r--r-- | lib/msgc/tests/Makefile | 6 | ||||
| -rw-r--r-- | lib/prstreams/Makefile | 6 | ||||
| -rw-r--r-- | lib/prstreams/tests/testprstrm/Makefile | 6 | ||||
| -rw-r--r-- | lib/tests/Makefile | 2 | ||||
| -rw-r--r-- | pr/src/cplus/tests/Makefile | 6 | ||||
| -rw-r--r-- | pr/tests/Makefile | 6 | ||||
| -rw-r--r-- | tools/Makefile | 2 |
7 files changed, 10 insertions, 24 deletions
diff --git a/lib/msgc/tests/Makefile b/lib/msgc/tests/Makefile index e3f4b1c7..d3181659 100644 --- a/lib/msgc/tests/Makefile +++ b/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/lib/prstreams/Makefile b/lib/prstreams/Makefile index 1cfaef52..706de958 100644 --- a/lib/prstreams/Makefile +++ b/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/lib/prstreams/tests/testprstrm/Makefile b/lib/prstreams/tests/testprstrm/Makefile index f17cb0d4..64b0ceed 100644 --- a/lib/prstreams/tests/testprstrm/Makefile +++ b/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/lib/tests/Makefile b/lib/tests/Makefile index bc9efd42..61f88a58 100644 --- a/lib/tests/Makefile +++ b/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/pr/src/cplus/tests/Makefile b/pr/src/cplus/tests/Makefile index f761001d..32a65373 100644 --- a/pr/src/cplus/tests/Makefile +++ b/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/pr/tests/Makefile b/pr/tests/Makefile index 90f6d8d9..c66c5216 100644 --- a/pr/tests/Makefile +++ b/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/tools/Makefile b/tools/Makefile index 8477d866..cb29c4fa 100644 --- a/tools/Makefile +++ b/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 |