From e2873e4be4e5154bcd0b6f12886cc48668be08ad Mon Sep 17 00:00:00 2001
From: "cls%seawood.org" <cls%seawood.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 10 Nov 1998 21:58:31 +0000
Subject: [PATCH] Do not explicitly set MAKE as GNU make automatically sets it.
  If NSPR_INSTALL_DIR is defined, then use --with-nspr, otherwise do not
 bother.

git-svn-id: svn://10.0.0.236/trunk@14369 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/client.mk | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/mozilla/client.mk b/mozilla/client.mk
index 00c84a61dd9..1109e39e988 100644
--- a/mozilla/client.mk
+++ b/mozilla/client.mk
@@ -42,7 +42,7 @@ CVS_CFLAGS = -q -z 3
 endif
 
 CVSCO		= cvs $(CVS_FLAGS) co -P
-MAKE		= gmake
+#MAKE		= gmake
 AUTOCONF	= autoconf
 TARGETS		= export libs install
 MKDIR		= mkdir
@@ -52,11 +52,8 @@ ifndef MOZ_TOOLKIT
 MOZ_TOOLKIT	= USE_DEFAULT
 endif
 
-ifndef NSPR_INSTALL_DIR
-NSPR_INSTALL_DIR = /usr/local/nspr
+ifdef NSPR_INSTALL_DIR
 NSPR_CONFIG_FLAG = --with-nspr=$(NSPR_INSTALL_DIR)
-else
-NSPR_CONFIG_FLAG = 
 endif
 
 all: checkout
@@ -80,7 +77,7 @@ configure:	mozilla/configure.in
 	echo autoobjdir = $$autoobjdir; \
 	(cd mozilla; $(AUTOCONF)); \
 	if test ! -d mozilla/$$autoobjdir; then $(MKDIR) mozilla/$$autoobjdir; fi; \
-	(cd mozilla/$$autoobjdir; ../configure $(NSPR_CONFIG_FLAG) --enable-toolkit=$(MOZ_TOOLKIT)); \
+	(cd mozilla/$$autoobjdir; LD_LIBRARY_PATH=$(LD_LIBRARY_PATH):$(NSPR_INSTALL_DIR)/lib ../configure $(NSPR_CONFIG_FLAG) --enable-toolkit=$(MOZ_TOOLKIT)); \
 
 mozilla/configure: mozilla/configure.in
 	$(MAKE) -f mozilla/client.mk configure