* configure.ac (S_FILE): Remove output variable.

* src/Makefile.in (S_FILE): No longer set by configure.

* msdos/sed1v2.inp (S_FILE): Update for format change.

2 files changed, 4 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index ccbb5ae5764..9b8de9ff23e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2012-07-31  Glenn Morris  <rgm@gnu.org>
 
+        * Makefile.in (S_FILE): No longer set by configure.
+
         * conf_post.h (config_opsysfile): Move earlier, so that WINDOWSNT
         is available.
         (alloca.h) [WINDOWSNT]: Don't include it on MS Windows.
diff --git a/src/Makefile.in b/src/Makefile.in
index 1ea7d162b14..b8298dfa101 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -56,7 +56,8 @@ lwlibdir = ../lwlib
 lispdir = ../lisp
 
 # Configuration files for .o files to depend on.
-S_FILE = @S_FILE@
+# MS-DOS sets S_FILE non-nil.
+S_FILE = 
 config_h = config.h conf_post.h $(S_FILE)
 
 bootstrap_exe = $(abs_builddir)/bootstrap-emacs$(EXEEXT)