Merge from emacs-24; up to 2012-04-26T03:04:36Z!cyd@gnu.org

[gnu-emacs] / msdos / sed3v2.inp

diff --git a/msdos/sed3v2.inp b/msdos/sed3v2.inp
index 3b2065157e09aa72d4186dce7df8d5ca6d4b638f..faa57996a25a25f8999566988da2b99220898e35 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-2011  Free Software Foundation, Inc.
+# Copyright (C) 1996, 1998, 2000-2012  Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
@@ -38,7 +38,8 @@ s/-DVERSION[^ ]* //
 /^CFLAGS *=/s!=.*$!=-O2 -g!
 /^C_SWITCH_SYSTEM *=/s!=.*$!=-DMSDOS!
 /^C_SWITCH_MACHINE *=/s/@C_SWITCH_MACHINE@//
-/^C_WARNINGS_SWITCH *=/s/@C_WARNINGS_SWITCH@//
+/^WARN_CFLAGS *=/s/@WARN_CFLAGS@//
+/^WERROR_CFLAGS *=/s/@WERROR_CFLAGS@//
 /^PROFILING_CFLAGS *=/s/@PROFILING_CFLAGS@//
 /^ALLOCA *=/s!@ALLOCA@!!
 /^EXEEXT *=/s!@EXEEXT@!!
@@ -50,5 +51,4 @@ s!^   \./!    !
   s/movemail[^ ]* *//
 }
 /^insrcdir=/s/^.*$/\#&/
-/^      *\$(insrcdir) ||/s,\$(insrcdir) ||,command.com /c if not exist $<,
-
+/^      *\$(insrcdir) ||/s,\$(insrcdir) ||,command.com /c if not exist $(<F),