Update NSPR to the NSPR_HEAD_20091019 CVS tag. r=wtc
authorTed Mielczarek <ted.mielczarek@gmail.com>
Tue, 20 Oct 2009 08:13:38 -0400
changeset 34031 d82fe5d73822cc510690b9cabe9f1265c4808ee4
parent 34030 c51d02c508120992f76536e954e13740a02bbc4a
child 34032 68490d9daf2309a55bfcdb3fc47cf5a664197efe
push idunknown
push userunknown
push dateunknown
reviewerswtc
milestone1.9.3a1pre
Update NSPR to the NSPR_HEAD_20091019 CVS tag. r=wtc
nsprpub/config/rules.mk
--- a/nsprpub/config/rules.mk
+++ b/nsprpub/config/rules.mk
@@ -382,19 +382,18 @@ ifeq (,$(filter-out AIX OS2,$(OS_ARCH)))
 NEED_ABSOLUTE_PATH = 1
 endif
 
 ifeq ($(NS_USE_GCC)_$(OS_ARCH),_WINNT)
 NEED_ABSOLUTE_PATH = 1
 endif
 
 ifdef NEED_ABSOLUTE_PATH
-PWD := $(shell pwd)
 # The quotes allow absolute paths to contain spaces.
-pr_abspath = "$(if $(findstring :,$(1)),$(1),$(if $(filter /%,$(1)),$(1),$(PWD)/$(1)))"
+pr_abspath = "$(if $(findstring :,$(1)),$(1),$(if $(filter /%,$(1)),$(1),$(CURDIR)/$(1)))"
 endif
 
 $(OBJDIR)/%.$(OBJ_SUFFIX): %.cpp
 	@$(MAKE_OBJDIR)
 ifeq ($(NS_USE_GCC)_$(OS_ARCH),_WINNT)
 	$(CCC) -Fo$@ -c $(CCCFLAGS) $(call pr_abspath,$<)
 else
 ifeq ($(NS_USE_GCC)_$(OS_ARCH),_WINCE)