; Merge from origin/emacs-25

[gnu-emacs] / msdos / sed3v2.inp

diff --git a/msdos/sed3v2.inp b/msdos/sed3v2.inp
index cd58e47305c27038b3c086f4e3a4d5786e1be71f..711f8fedba6e46f12df842e937da3ce2b22cc824 100644 (file)
--- a/msdos/sed3v2.inp
+++ b/msdos/sed3v2.inp
@@ -2,7 +2,7 @@
 # Configuration script for lib-src/makefile under DJGPP v2
 # ----------------------------------------------------------------------
 #
-# Copyright (C) 1996, 1998, 2000-2012  Free Software Foundation, Inc.
+# Copyright (C) 1996, 1998, 2000-2016 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
@@ -42,9 +42,17 @@ s/-DVERSION[^ ]* //
 /^C_SWITCH_MACHINE *=/s/@C_SWITCH_MACHINE@//
 /^WARN_CFLAGS *=/s/@WARN_CFLAGS@//
 /^WERROR_CFLAGS *=/s/@WERROR_CFLAGS@//
+/^UPDATE_MANIFEST *=/s/@UPDATE_MANIFEST@//
 /^PROFILING_CFLAGS *=/s/@PROFILING_CFLAGS@//
 /^ALLOCA *=/s!@ALLOCA@!!
-/^EXEEXT *=/s!@EXEEXT@!!
+/^EXEEXT *=/s!@EXEEXT@!.exe!
+/^CLIENTW *=/s/@CLIENTW@//
+/^LIB_FDATASYNC *=/s/@LIB_FDATASYNC@//
+/^LIB_WSOCK32 *=/s/@LIB_WSOCK32@//
+/^LIBS_ECLIENT *=/s/@LIBS_ECLIENT@//
+/^NTLIB *=/s/@NTLIB@//
+/^CLIENTRES *=/s/@CLIENTRES@//
+/^WINDRES *=/s/@WINDRES@//
 /^GETOPT_H *=/s!@GETOPT_H@!getopt.h!
 /^GETOPTOBJS *=/s!@GETOPTOBJS@!getopt.o getopt1.o!
 /^INSTALLABLES/s/emacsclient[^ ]* *//