diff options
| author | wtc%netscape.com <devnull@localhost> | 2001-02-07 19:07:27 +0000 |
|---|---|---|
| committer | wtc%netscape.com <devnull@localhost> | 2001-02-07 19:07:27 +0000 |
| commit | 37ae1aae48a9773cf37fb12d3d618b21b0ba3bf3 (patch) | |
| tree | c9564111598e614d5093122a0d46966c4975e9f2 | |
| parent | 7a4fe5e4efeb69563c22bf7e801be2ca83549150 (diff) | |
| download | nss-hg-37ae1aae48a9773cf37fb12d3d618b21b0ba3bf3.tar.gz | |
Bugzilla bug #62855: backed out my previous checkin, which doesn't quite
work. Will look at this later.
Modified files: arch.mk, config.mk
(NSS_3_1_BRANCH)
| -rw-r--r-- | security/coreconf/arch.mk | 4 | ||||
| -rw-r--r-- | security/coreconf/config.mk | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/security/coreconf/arch.mk b/security/coreconf/arch.mk index 0e67c5577..ec13b0ac9 100644 --- a/security/coreconf/arch.mk +++ b/security/coreconf/arch.mk @@ -234,7 +234,11 @@ endif # This variable is used to get OS_CONFIG.mk. # +ifeq ($(OS_ARCH),OS2) +OS_CONFIG = $(OS_TARGET) +else OS_CONFIG = $(OS_TARGET)$(OS_RELEASE) +endif # # OBJDIR_TAG depends on the predefined variable BUILD_OPT, diff --git a/security/coreconf/config.mk b/security/coreconf/config.mk index 613d3bc2e..9ce293db5 100644 --- a/security/coreconf/config.mk +++ b/security/coreconf/config.mk @@ -56,7 +56,7 @@ include $(CORE_DEPTH)/coreconf/command.mk # each OS release. # ####################################################################### -ifeq (,$(filter-out NetBSD OS2,$(OS_TARGET))) +ifeq (,$(filter-out NetBSD,$(OS_TARGET))) include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk else include $(CORE_DEPTH)/coreconf/$(OS_CONFIG).mk |