From eed1d640a6dd07055e42e48471d55bc9980e0da6 Mon Sep 17 00:00:00 2001
From: spider <spider>
Date: Thu, 4 Jun 1998 06:31:05 +0000
Subject: [PATCH] Fix for building on Linux

---
 shell/src/Makefile | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/shell/src/Makefile b/shell/src/Makefile
index 0f6ee0312d8..d19de059287 100644
--- a/shell/src/Makefile
+++ b/shell/src/Makefile
@@ -17,6 +17,8 @@
 
 DEPTH = ../..
 
+include $(DEPTH)/config/config.mk
+
 DIRS = unix 
 
 MODULE=shell
@@ -27,12 +29,19 @@ DEFINES = -D_IMPL_NS_SHELL
 
 EXTRA_DSO_LDOPTS+= -L$(DIST)/lib \
 		$(DIST)/bin/libxpcom.so \
-		$(DIST)/bin/libreg.so -lXm -lXt -lX11 $(LIBNSPR)
+		$(DIST)/bin/libreg.so  $(LIBNSPR)
 
 ifeq ($(OS_ARCH),linux)
 EXTRA_DSO_LDOPTS+= /usr/lib/libc.a /usr/lib/libstdc++.a 
 endif
 
+# This should really be done properly in 'config'
+ifeq ($(OS_ARCH),Linux)
+EXTRA_DSO_LDOPTS+=  -L/usr/X11R6/lib -lXm -lXt -lX11
+else
+EXTRA_DSO_LDOPTS+= -lXm -lXt -lX11
+endif
+
 LCFLAGS=-I$(PUBLIC)/xpcom -I$(PUBLIC)/raptor \
       -I$(PUBLIC)/dom -I$(PUBLIC)/js -I$(PUBLIC)/netlib -I$(PUBLIC)/shell
 
@@ -51,7 +60,6 @@ CPP_OBJS=				\
  ./$(OBJDIR)/nsShellInstance.o		\
  $(NULL)
 
-include $(DEPTH)/config/config.mk
 
 TARGETS = $(LIBRARY)