diff options
| author | wtc%netscape.com <devnull@localhost> | 2001-01-31 21:29:31 +0000 |
|---|---|---|
| committer | wtc%netscape.com <devnull@localhost> | 2001-01-31 21:29:31 +0000 |
| commit | 3bc69c347305c4443af205d6f79d5e6c13e4727d (patch) | |
| tree | 5107b8dc2cd62165fe51cd8f0541692c6f99cbeb /security/nss | |
| parent | 84df8c1087dbeb13631f570702aeb7056592812b (diff) | |
| download | nss-hg-3bc69c347305c4443af205d6f79d5e6c13e4727d.tar.gz | |
Bugzilla bug #62855: checked in OS/2 makefile patches from Javier
Pedemonte <pedemont@us.ibm.com>.
Modified Files:
coreconf/OS2.mk coreconf/arch.mk coreconf/prefix.mk
coreconf/rules.mk coreconf/suffix.mk nss/Makefile
nss/cmd/platlibs.mk nss/lib/ckfw/builtins/config.mk
Diffstat (limited to 'security/nss')
| -rw-r--r-- | security/nss/Makefile | 6 | ||||
| -rw-r--r-- | security/nss/cmd/platlibs.mk | 8 | ||||
| -rw-r--r-- | security/nss/lib/ckfw/builtins/config.mk | 2 |
3 files changed, 12 insertions, 4 deletions
diff --git a/security/nss/Makefile b/security/nss/Makefile index 5b42d5168..cff6adeed 100644 --- a/security/nss/Makefile +++ b/security/nss/Makefile @@ -87,9 +87,9 @@ endif mv $(DIST)/lib/dbm32.lib $(DIST)/lib/dbm.lib else ifeq ($(OS_ARCH),OS2) - cp -r $(DIST)/../include $(DIST) - cp -r $(DIST)/../lib $(DIST) - mv $(DIST)/lib/libmozdbm_s.$(LIB_SUFFIX) $(DIST)/lib/libdbm.$(LIB_SUFFIX) + cp -rf $(DIST)/../include $(DIST) + cp -rf $(DIST)/../lib $(DIST) + cp -f $(DIST)/lib/libmozdbm_s.$(LIB_SUFFIX) $(DIST)/lib/libdbm.$(LIB_SUFFIX) else $(NSINSTALL) -L ../../dist include $(DIST) $(NSINSTALL) -L ../../dist lib $(DIST) diff --git a/security/nss/cmd/platlibs.mk b/security/nss/cmd/platlibs.mk index d9279c477..4f486e938 100644 --- a/security/nss/cmd/platlibs.mk +++ b/security/nss/cmd/platlibs.mk @@ -116,6 +116,13 @@ endif # $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS) # $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX. +ifdef XP_OS2_VACPP +EXTRA_SHARED_LIBS += \ + $(DIST)/lib/plc4.lib \ + $(DIST)/lib/plds4.lib \ + $(DIST)/lib/nspr4.lib \ + $(NULL) +else EXTRA_SHARED_LIBS += \ -L$(DIST)/lib/ \ -lplc4 \ @@ -123,6 +130,7 @@ EXTRA_SHARED_LIBS += \ -lnspr4 \ $(NULL) endif +endif else # can't do this in manifest.mn because OS_ARCH isn't defined there. diff --git a/security/nss/lib/ckfw/builtins/config.mk b/security/nss/lib/ckfw/builtins/config.mk index 9ee0fb0b2..7d6df6c87 100644 --- a/security/nss/lib/ckfw/builtins/config.mk +++ b/security/nss/lib/ckfw/builtins/config.mk @@ -42,7 +42,7 @@ LIBRARY = IMPORT_LIBRARY = PROGRAM = -ifeq ($(OS_ARCH), WINNT) +ifeq (,$(filter-out OS2 WINNT,$(OS_ARCH))) SHARED_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).dll endif |