From dba78bf566ba52cfbc4129047cca340cffca92fd Mon Sep 17 00:00:00 2001
From: "cls%seawood.org" <cls%seawood.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 3 Oct 1998 05:02:15 +0000
Subject: [PATCH] Removed NSPR build kludge.

git-svn-id: svn://10.0.0.236/trunk@11848 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/Makefile.in      | 26 --------------------------
 mozilla/config/config.mk |  2 --
 2 files changed, 28 deletions(-)

diff --git a/mozilla/Makefile.in b/mozilla/Makefile.in
index 718e528c1a8..225fcbd0e56 100644
--- a/mozilla/Makefile.in
+++ b/mozilla/Makefile.in
@@ -22,10 +22,6 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-NSPRDIR		= $(topsrcdir)/nsprpub
-NSPR20		= 1
-NSPR_MAKE_ARGS	= -C $(NSPRDIR) DIST=`pwd`/dist NS_USE_GCC=$(GNU_CC) MOZILLA_CLIENT=$(MOZILLA_CLIENT) MOZ_DEBUG=$(MOZ_DEBUG) USE_PTHREADS=$(USE_PTHREADS) BUILD_OPT=$(BUILD_OPT) NO_MDUPDATE=$(NO_MDUPDATE) $@
-
 ifndef NO_MOCHA
 DIRS_JS		= js
 endif
@@ -66,29 +62,7 @@ endif
 
 include $(topsrcdir)/config/rules.mk
 
-ifndef LOSE_NSPR
 export:: envirocheck
-	$(MAKE) $(NSPR_MAKE_ARGS)
-
-libs::
-	$(MAKE) $(NSPR_MAKE_ARGS)
-               
-install::
-	$(MAKE) $(NSPR_MAKE_ARGS)
-               
-clean::
-	$(MAKE) $(NSPR_MAKE_ARGS)
-               
-realclean::
-	$(MAKE) $(NSPR_MAKE_ARGS)
-
-clobber::
-	$(MAKE) $(NSPR_MAKE_ARGS)
-               
-clobber_all::
-	$(MAKE) $(NSPR_MAKE_ARGS)
-
-endif
 
 # Running this rule assembles all the SDK source pieces into dist/sdk.
 # You'll need to run this rule on every platform to get all the
diff --git a/mozilla/config/config.mk b/mozilla/config/config.mk
index 215bd50f497..13cb48e2dab 100644
--- a/mozilla/config/config.mk
+++ b/mozilla/config/config.mk
@@ -301,9 +301,7 @@ LIBAWT		= $(DIST)/lib/libawt.$(LIB_SUFFIX)
 LIBMMEDIA	= $(DIST)/lib/libmmedia.$(LIB_SUFFIX)
 
 NSPR20		= 1
-ifndef USE_AUTOCONF
 NSPRDIR		= nsprpub
-endif
 DEFINES		+= -DNSPR20
 INCLUDES	+= -I$(DIST)/include
 LIBNSPR		= $(DIST)/lib/libplds21.$(LIB_SUFFIX) $(DIST)/lib/libnspr21.$(LIB_SUFFIX)