Bug 670249 - Get rid of NFSPWD from config.mk. rs=Callek
authorSiddharth Agarwal <sid.bugzilla@gmail.com>
Thu, 14 Jul 2011 14:31:51 -0700
changeset 8570 38876eeaef86c170e7188b9412267174e00aebdd
parent 8569 45a849aee6165bb8e10b3d46cd0c0b61ceaef9c3
child 8571 c7733cc3da46aee7686bbafd3c65c5f75c4c3827
push id158
push userbugzilla@standard8.plus.com
push dateTue, 27 Sep 2011 19:18:14 +0000
treeherdercomm-beta@e47b99c61e4d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersCallek
bugs670249
Bug 670249 - Get rid of NFSPWD from config.mk. rs=Callek
config/config.mk
--- a/config/config.mk
+++ b/config/config.mk
@@ -356,17 +356,16 @@ endif
 #
 MY_CONFIG	:= $(DEPTH)/config/myconfig.mk
 MY_RULES	:= $(DEPTH)/config/myrules.mk
 
 #
 # Default command macros; can be overridden in <arch>.mk.
 #
 CCC		= $(CXX)
-NFSPWD		= $(CONFIG_TOOLS)/nfspwd
 PURIFY		= purify $(PURIFYOPTIONS)
 QUANTIFY	= quantify $(QUANTIFYOPTIONS)
 ifdef CROSS_COMPILE
 XPIDL_COMPILE 	= $(CYGWIN_WRAPPER) $(LIBXUL_DIST)/host/bin/host_xpidl$(HOST_BIN_SUFFIX)
 else
 XPIDL_COMPILE 	= $(CYGWIN_WRAPPER) $(LIBXUL_DIST)/bin/xpidl$(BIN_SUFFIX)
 endif
 XPIDL_LINK = $(PYTHON) $(SDK_BIN_DIR)/xpt.py link
@@ -625,25 +624,19 @@ else
 NSINSTALL	= $(CONFIG_TOOLS)/nsinstall$(HOST_BIN_SUFFIX)
 endif # OS2
 endif # NSINSTALL_BIN
 
 ifeq (,$(CROSS_COMPILE)$(filter-out WINNT OS2, $(OS_ARCH)))
 INSTALL		= $(NSINSTALL)
 else
 
-ifeq ($(OS_ARCH),Darwin)
-INSTALL_PWD     = $(PWD)
-else
-INSTALL_PWD     = `$(NFSPWD)`
-endif # Darwin
-
 # This isn't laid out as conditional directives so that NSDISTMODE can be
 # target-specific.
-INSTALL         = $(if $(filter copy, $(NSDISTMODE)), $(NSINSTALL) -t, $(if $(filter absolute_symlink, $(NSDISTMODE)), $(NSINSTALL) -L $(INSTALL_PWD), $(NSINSTALL) -R))
+INSTALL         = $(if $(filter copy, $(NSDISTMODE)), $(NSINSTALL) -t, $(if $(filter absolute_symlink, $(NSDISTMODE)), $(NSINSTALL) -L $(PWD), $(NSINSTALL) -R))
 
 endif # WINNT/OS2
 
 # Use nsinstall in copy mode to install files on the system
 SYSINSTALL	= $(NSINSTALL) -t
 
 # Directory nsinstall. Windows and OS/2 nsinstall can't recursively copy
 # directories.