From 6899d2dfb0a130dc005e388d9c70739510b591cd Mon Sep 17 00:00:00 2001 From: "mcafee%netscape.com" Date: Mon, 9 Nov 1998 22:03:24 +0000 Subject: [PATCH] renaming WITH_NSPR to NSPR_INSTALL_DIR --- client.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/client.mk b/client.mk index f2f9e75618c..eb0f14bd9ea 100644 --- a/client.mk +++ b/client.mk @@ -52,8 +52,8 @@ ifndef MOZ_TOOLKIT MOZ_TOOLKIT = USE_DEFAULT endif -ifndef WITH_NSPR -WITH_NSPR = /usr/local/nspr +ifndef NSPR_INSTALL_DIR +NSPR_INSTALL_DIR = /usr/local/nspr endif -include $(DEPTH)/config/config.mk @@ -79,7 +79,7 @@ build: PWD=`pwd` (cd mozilla; $(AUTOCONF)) if test ! -d mozilla/$(OBJDIR); then rm -rf mozilla/$(@OBJDIR); mkdir -D mozilla/$(OBJDIR); else true; fi - (cd mozilla/$(OBJDIR); ../configure --with-nspr=$(WITH_NSPR) --enable-toolkit=$(MOZ_TOOLKIT)) + (cd mozilla/$(OBJDIR); ../configure --with-nspr=$(NSPR_INSTALL_DIR) --enable-toolkit=$(MOZ_TOOLKIT)) (cd mozilla/$(OBJDIR); gmake depend) (cd mozilla/$(OBJDIR); gmake) @@ -92,5 +92,5 @@ build: # Build & install nspr. Classic build, no autoconf. # Linux/RPM available. nspr: - ($(MAKE) -C mozilla/nsprpub DIST=$(WITH_NSPR) NSDISTMODE=copy NS_USE_GCC=1 MOZILLA_CLIENT=1 NO_MDUPDATE=1 NS_USE_NATIVE= ) + ($(MAKE) -C mozilla/nsprpub DIST=$(NSPR_INSTALL_DIR) NSDISTMODE=copy NS_USE_GCC=1 MOZILLA_CLIENT=1 NO_MDUPDATE=1 NS_USE_NATIVE= )