diff options
| author | wtc%netscape.com <devnull@localhost> | 2001-02-07 23:42:50 +0000 |
|---|---|---|
| committer | wtc%netscape.com <devnull@localhost> | 2001-02-07 23:42:50 +0000 |
| commit | c90ced8e1814b3c89036c33a9ebafdce1fa99107 (patch) | |
| tree | 0e497de77bbb98ddb163ade256cadeecd74848ff | |
| parent | 37ae1aae48a9773cf37fb12d3d618b21b0ba3bf3 (diff) | |
| download | nss-hg-c90ced8e1814b3c89036c33a9ebafdce1fa99107.tar.gz | |
Bugzilla bug #62855: put my patch back in again. Sorry about the
flipflop.
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, 1 insertions, 5 deletions
diff --git a/security/coreconf/arch.mk b/security/coreconf/arch.mk index ec13b0ac9..0e67c5577 100644 --- a/security/coreconf/arch.mk +++ b/security/coreconf/arch.mk @@ -234,11 +234,7 @@ 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 9ce293db5..613d3bc2e 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,$(OS_TARGET))) +ifeq (,$(filter-out NetBSD OS2,$(OS_TARGET))) include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk else include $(CORE_DEPTH)/coreconf/$(OS_CONFIG).mk |