Bug 506493 - Resync' configure.in between c-c and m-c; (Cv1) Copy bug 520359 and bug 524554.
authorSerge Gautherie <sgautherie.bz@free.fr>
Sat, 13 Mar 2010 01:15:42 +0100
changeset 5163 86c1a9c1f19279c3cb6f75a12800e0f3c9d75e05
parent 5162 42abd8a808771c56307c1d0e8fb9cd15a5cbdcc8
child 5164 98495510718dfb012d25daf2fac98479882b7c9a
push id3986
push usersgautherie.bz@free.fr
push dateSat, 13 Mar 2010 00:33:45 +0000
treeherdercomm-central@98495510718d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs506493, 520359, 524554
Bug 506493 - Resync' configure.in between c-c and m-c; (Cv1) Copy bug 520359 and bug 524554. r=Callek. Bug 520359 - pymake fails to build Firefox Bug 524554 - WinMo package-tests broken: nsinstall path too long?
config/config.mk
--- a/config/config.mk
+++ b/config/config.mk
@@ -762,17 +762,17 @@ PWD := $(CURDIR)
 endif
 
 ifdef NSINSTALL_BIN
 NSINSTALL	= $(CYGWIN_WRAPPER) $(NSINSTALL_BIN)
 else
 ifeq (OS2,$(CROSS_COMPILE)$(OS_ARCH))
 NSINSTALL	= $(MOZ_TOOLS_DIR)/nsinstall
 else
-NSINSTALL	= $(CONFIG_TOOLS)/nsinstall
+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 ($(NSDISTMODE),copy)
@@ -788,21 +788,16 @@ INSTALL		= $(NSINSTALL) -L `$(NFSPWD)`
 endif # Darwin
 else
 # install using relative symbolic links
 INSTALL		= $(NSINSTALL) -R
 endif # absolute_symlink
 endif # copy
 endif # WINNT/OS2
 
-ifeq (,$(filter-out WINCE,$(OS_ARCH)))
-NSINSTALL	= $(CYGWIN_WRAPPER) nsinstall
-INSTALL     = $(CYGWIN_WRAPPER) nsinstall 
-endif
-
 # Use nsinstall in copy mode to install files on the system
 SYSINSTALL	= $(NSINSTALL) -t
 
 ifeq ($(OS_ARCH),WINNT)
 ifneq (,$(CYGDRIVE_MOUNT))
 export CYGDRIVE_MOUNT
 endif
 endif