Merge

config/Makefile.in

@@ -51,7 +51,7 @@ VISIBILITY_FLAGS =
 HOST_PROGRAM	= nsinstall$(HOST_BIN_SUFFIX)
 
 ifeq (WINNT,$(HOST_OS_ARCH))
-HOST_CSRCS = nsinstall_win.c
+HOST_CSRCS	= nsinstall_win.c
 HOST_EXTRA_LIBS = $(call EXPAND_LIBNAME,shlwapi)
 else
 HOST_CSRCS	= nsinstall.c pathsub.c

js/src/config/Makefile.in

@@ -51,8 +51,7 @@ VISIBILITY_FLAGS =
 HOST_PROGRAM	= nsinstall$(HOST_BIN_SUFFIX)
 
 ifeq (WINNT,$(HOST_OS_ARCH))
-HOST_CSRCS = nsinstall_win.c
-HOST_EXTRA_LIBS = $(call EXPAND_LIBNAME,shlwapi)
+HOST_CSRCS      = nsinstall_win.c
 else
 HOST_CSRCS	= nsinstall.c pathsub.c
 endif

js/src/config/nsinstall_win.c

@@ -11,7 +11,6 @@
 #include <string.h>
 #include <assert.h>
 #include <windows.h>
-#include <shlwapi.h>
 #pragma hdrstop
 
 /*
@@ -333,8 +332,6 @@ sh_DoCopy(wchar_t *srcFileName,
         }
 
         if (!CopyFile(longSrc, longDst, FALSE)) {
-            if (!wcscmp(PathFindExtension(longSrc), L".chk"))
-              return TRUE; // Incredibly ugly hack to work around Bug 539689
             fprintf(stderr, "nsinstall: cannot copy %ls to %ls: %s\n",
                     srcFileName, dstFileName, sh_GetLastErrorMessage());
             return FALSE;