From b760f769a1a99e1b9bf63d465ce44a8560abf7ba Mon Sep 17 00:00:00 2001
From: "briano%netscape.com"
 <briano%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 26 Mar 1999 23:06:38 +0000
Subject: [PATCH] Fixed the bug that was assuming Linux==x86 (only).

git-svn-id: svn://10.0.0.236/trunk@25235 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../libxpt/xptcall/src/md/unix/Makefile.in    | 28 +++++++++----------
 .../reflect/xptcall/src/md/unix/Makefile.in   | 28 +++++++++----------
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/mozilla/xpcom/libxpt/xptcall/src/md/unix/Makefile.in b/mozilla/xpcom/libxpt/xptcall/src/md/unix/Makefile.in
index 92df7d2b1be..24903bf6c2a 100644
--- a/mozilla/xpcom/libxpt/xptcall/src/md/unix/Makefile.in
+++ b/mozilla/xpcom/libxpt/xptcall/src/md/unix/Makefile.in
@@ -1,4 +1,3 @@
-#!gmake
 #
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "NPL"); you may not use this file except in
@@ -16,7 +15,7 @@
 # Reserved.
 #
 
-DEPTH=../../../../../..
+DEPTH		= ../../../../../..
 
 topsrcdir	= @top_srcdir@
 VPATH		= @srcdir@
@@ -26,22 +25,23 @@ include $(DEPTH)/config/autoconf.mk
 
 include $(topsrcdir)/config/config.mk
 
-CFLAGS	+= -DEXPORT_XPTC_API
+CFLAGS		+= -DEXPORT_XPTC_API
 
 LIBRARY_NAME	= xptcmd
-
 MODULE		= xptcall
 
-ifeq ($(OS_ARCH), Linux)
-CPPSRCS=		\
-	xptcinvoke_linux_x86.cpp \
-	xptcstubs_linux_x86.cpp \
-	$(NULL)
-else
-CPPSRCS=		\
-	xptcinvoke_unsupported.cpp \
-	xptcstubs_unsupported.cpp \
-	$(NULL)
+CPPSRCS		= \
+		  xptcinvoke_unsupported.cpp \
+		  xptcstubs_unsupported.cpp \
+		  $(NULL)
+
+ifeq ($(OS_ARCH),Linux)
+ifeq (86,$(findstring 86,$(OS_TEST)))
+CPPSRCS		= \
+		  xptcinvoke_linux_x86.cpp \
+		  xptcstubs_linux_x86.cpp \
+		  $(NULL)
+endif
 endif
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in b/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in
index 92df7d2b1be..24903bf6c2a 100644
--- a/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in
+++ b/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in
@@ -1,4 +1,3 @@
-#!gmake
 #
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "NPL"); you may not use this file except in
@@ -16,7 +15,7 @@
 # Reserved.
 #
 
-DEPTH=../../../../../..
+DEPTH		= ../../../../../..
 
 topsrcdir	= @top_srcdir@
 VPATH		= @srcdir@
@@ -26,22 +25,23 @@ include $(DEPTH)/config/autoconf.mk
 
 include $(topsrcdir)/config/config.mk
 
-CFLAGS	+= -DEXPORT_XPTC_API
+CFLAGS		+= -DEXPORT_XPTC_API
 
 LIBRARY_NAME	= xptcmd
-
 MODULE		= xptcall
 
-ifeq ($(OS_ARCH), Linux)
-CPPSRCS=		\
-	xptcinvoke_linux_x86.cpp \
-	xptcstubs_linux_x86.cpp \
-	$(NULL)
-else
-CPPSRCS=		\
-	xptcinvoke_unsupported.cpp \
-	xptcstubs_unsupported.cpp \
-	$(NULL)
+CPPSRCS		= \
+		  xptcinvoke_unsupported.cpp \
+		  xptcstubs_unsupported.cpp \
+		  $(NULL)
+
+ifeq ($(OS_ARCH),Linux)
+ifeq (86,$(findstring 86,$(OS_TEST)))
+CPPSRCS		= \
+		  xptcinvoke_linux_x86.cpp \
+		  xptcstubs_linux_x86.cpp \
+		  $(NULL)
+endif
 endif
 
 include $(topsrcdir)/config/rules.mk