From d67bf8169203e9b06320ab0145228e6ed68431ee Mon Sep 17 00:00:00 2001
From: "wtc%netscape.com"
 <wtc%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Mon, 2 Dec 2002 22:57:21 +0000
Subject: [PATCH] Bug 181913: disable the makefile rule for .s for OS/2 so that
 .asm files are used when there are same-named .s files in the same directory.
  The patch is contributed by Javier Pedemonte <pedemont@us.ibm.com>.

git-svn-id: svn://10.0.0.236/trunk@134636 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/security/coreconf/rules.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mozilla/security/coreconf/rules.mk b/mozilla/security/coreconf/rules.mk
index 9ef3312e06b..4b4568790b2 100644
--- a/mozilla/security/coreconf/rules.mk
+++ b/mozilla/security/coreconf/rules.mk
@@ -418,11 +418,13 @@ else
 	$(CC) -o $@ -c $(CFLAGS) $<
 endif
 
+ifndef XP_OS2_VACPP
 ifneq (,$(filter-out WIN%,$(OS_TARGET)))
 $(OBJDIR)/$(PROG_PREFIX)%$(OBJ_SUFFIX): %.s
 	@$(MAKE_OBJDIR)
 	$(AS) -o $@ $(ASFLAGS) -c $<
 endif
+endif
 
 $(OBJDIR)/$(PROG_PREFIX)%$(OBJ_SUFFIX): %.asm
 	@$(MAKE_OBJDIR)