From 9712b25c1288ec63b7b03b5a32fb17b63e3fcb51 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Thu, 4 Aug 2016 17:55:54 +0900
Subject: [PATCH] Bug 1292080 - Don't set NSINSTALL_BIN from old-configure.
 r=gps

The only use of this variable is to override NSINSTALL, and its value is
the same as NSINSTALL_PY.

While here, remove the outdated NSINSTALL_NATIVECMD that was used for
pymake.

--HG--
extra : rebase_source : b871fbb409836a17cb8d71cd1e5ddc9d5ad3f49f
---
 config/config.mk        | 12 +-----------
 js/src/old-configure.in |  5 -----
 old-configure.in        |  5 -----
 3 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/config/config.mk b/config/config.mk
index 75ebb7ee7d7f..1c23e6f7905e 100644
--- a/config/config.mk
+++ b/config/config.mk
@@ -415,21 +415,11 @@ PWD := $(CURDIR)
 endif
 
 NSINSTALL_PY := $(PYTHON) $(abspath $(MOZILLA_DIR)/config/nsinstall.py)
-# For Pymake, wherever we use nsinstall.py we're also going to try to make it
-# a native command where possible. Since native commands can't be used outside
-# of single-line commands, we continue to provide INSTALL for general use.
-# Single-line commands should be switched over to install_cmd.
-NSINSTALL_NATIVECMD := %nsinstall nsinstall
-
-ifdef NSINSTALL_BIN
-NSINSTALL = $(NSINSTALL_BIN)
-else
-ifeq ($(HOST_OS_ARCH),WINNT)
+ifneq (,$(or $(filter WINNT,$(HOST_OS_ARCH)),$(if $(COMPILE_ENVIRONMENT),,1)))
 NSINSTALL = $(NSINSTALL_PY)
 else
 NSINSTALL = $(DEPTH)/config/nsinstall$(HOST_BIN_SUFFIX)
 endif # WINNT
-endif # NSINSTALL_BIN
 
 
 ifeq (,$(CROSS_COMPILE)$(filter-out WINNT, $(OS_ARCH)))
diff --git a/js/src/old-configure.in b/js/src/old-configure.in
index a309ae807e0b..d95521d8ed93 100644
--- a/js/src/old-configure.in
+++ b/js/src/old-configure.in
@@ -318,11 +318,6 @@ AC_SUBST(GNU_CXX)
 dnl ========================================================
 dnl Checks for programs.
 dnl ========================================================
-if test -z "$COMPILE_ENVIRONMENT"; then
-    NSINSTALL_BIN='$(PYTHON) $(topsrcdir)/config/nsinstall.py'
-fi
-AC_SUBST(NSINSTALL_BIN)
-
 if test "$COMPILE_ENVIRONMENT"; then
 
 dnl ========================================================
diff --git a/old-configure.in b/old-configure.in
index 4ecaac6882db..bf685221c96e 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -475,11 +475,6 @@ AC_SUBST(MOZ_MSVC_STL_WRAP_RAISE)
 dnl ========================================================
 dnl Checks for programs.
 dnl ========================================================
-if test -z "$COMPILE_ENVIRONMENT"; then
-    NSINSTALL_BIN='$(PYTHON) $(MOZILLA_DIR)/config/nsinstall.py'
-fi
-AC_SUBST(NSINSTALL_BIN)
-
 if test "$COMPILE_ENVIRONMENT"; then
 
 dnl ========================================================