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

ChangeLog

 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):

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)

msdos/ChangeLog

+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).

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!

src/ChangeLog

 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.

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)