* 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.

6 files changed, 11 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index dd206adfcec..407bec2a03b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2012-07-31  Glenn Morris  <rgm@gnu.org>
 
+        * configure.ac (S_FILE): Remove output variable.
+
         * configure.ac (opsysfile): Use AH_TEMPLATE.  Doc fix.
 
         * configure.ac (NULL_DEVICE, SEPCHAR, USER_FULL_NAME):
diff --git a/configure.ac b/configure.ac
index 7b8766b0c5f..cf4e0540d2f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3876,8 +3876,6 @@ AC_SUBST(GNUSTEP_CFLAGS)
 AC_SUBST(CFLAGS)
 ## Used in lwlib/Makefile.in.
 AC_SUBST(X_TOOLKIT_TYPE)
-S_FILE=
-AC_SUBST(S_FILE)
 AC_SUBST(ns_appdir)
 AC_SUBST(ns_appbindir)
 AC_SUBST(ns_appresdir)
diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index c5b509c72af..503c7cbf8a1 100644
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,3 +1,7 @@
+2012-07-31  Glenn Morris  <rgm@gnu.org>
+
+        * sed1v2.inp (S_FILE): Update for format change.
+
 2012-07-28  Paul Eggert  <eggert@cs.ucla.edu>
 
         Use Gnulib stdalign module (Bug#9772, Bug#9960).
diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp
index 7a43697a06a..1fd81ba0e4b 100644
--- a/msdos/sed1v2.inp
+++ b/msdos/sed1v2.inp
@@ -129,7 +129,7 @@ s/\.h\.in/.h-in/
 /^MKDEPDIR *=/s/@MKDEPDIR@//
 /^version *=/s/@[^@\n]*@//
 /^M_FILE *=/s!@M_FILE@!$(srcdir)/m/intel386.h!
-/^S_FILE *=/s!@S_FILE@!$(srcdir)/s/msdos.h!
+/^S_FILE *=/s!=!= $(srcdir)/s/msdos.h!
 /^@SET_MAKE@$/s/@SET_MAKE@//
 /^      [       ]*\$(libsrc)\/make-docfile.*>.*\/DOC/s!make-docfile!make-docfile -o $(etc)/DOC!
 /^      [       ]*\$(libsrc)\/make-docfile.*>.*gl-tmp/s!make-docfile!make-docfile -o gl-tmp!
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)