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

diff --git a/ChangeLog b/ChangeLog
index dd206adfcec85187704792888b201d3628f35c4e..407bec2a03bb40f22bd0bec163baf13c5e7dc165 100644 (file)
--- 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 7b8766b0c5f8278a997f6ddb5d6d5de6a7568118..cf4e0540d2fdf8354dfd25ca93e95f5ea0e8a4eb 100644 (file)
--- 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 c5b509c72af7ab43d93795123796ba57cf104f9c..503c7cbf8a1b63f503379ce3e22d7e8549267121 100644 (file)
--- 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 7a43697a06a9c76e860717c637e6a4d1752470f7..1fd81ba0e4bcf0fe819837a34cf90a4dfca3c091 100644 (file)
--- 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 ccbb5ae5764a21fb158578de29f1a3ec63cd45aa..9b8de9ff23e6f683cf75522b1b8056a8c97cd570 100644 (file)
--- 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 1ea7d162b14581c8329e1b99cfc3f088a915f91d..b8298dfa101a794885229a70e3aa21e0af623e38 100644 (file)
--- 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)