diff --git a/config/Makefile.in b/config/Makefile.in index 65999a755f2..6b2f0d75e1e 100644 --- a/config/Makefile.in +++ b/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 diff --git a/js/src/config/Makefile.in b/js/src/config/Makefile.in index 7b037e7d063..dfed04b23e3 100644 --- a/js/src/config/Makefile.in +++ b/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 diff --git a/js/src/config/nsinstall_win.c b/js/src/config/nsinstall_win.c index cdca9cbb7db..ccc9dc94f2c 100644 --- a/js/src/config/nsinstall_win.c +++ b/js/src/config/nsinstall_win.c @@ -11,7 +11,6 @@ #include #include #include -#include #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;