[Emacs-diffs] /srv/bzr/emacs/trunk r109346: * configure.ac (S_FILE): Remove output variable.

[Glenn Morris]

------------------------------------------------------------
revno: 109346
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2012-07-31 19:20:25 -0400
message:
  * 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.
modified:
  ChangeLog
  configure.ac
  msdos/ChangeLog
  msdos/sed1v2.inp
  src/ChangeLog
  src/Makefile.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-07-31 23:12:24 +0000
+++ b/ChangeLog 2012-07-31 23:20:25 +0000
@@ -1,5 +1,7 @@
 2012-07-31  Glenn Morris  <address@hidden>
 
+       * configure.ac (S_FILE): Remove output variable.
+
        * configure.ac (opsysfile): Use AH_TEMPLATE.  Doc fix.
 
        * configure.ac (NULL_DEVICE, SEPCHAR, USER_FULL_NAME):

=== modified file 'configure.ac'
--- a/configure.ac      2012-07-31 23:12:24 +0000
+++ b/configure.ac      2012-07-31 23:20:25 +0000
@@ -3876,8 +3876,6 @@
 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)

=== modified file 'msdos/ChangeLog'
--- a/msdos/ChangeLog   2012-07-28 23:05:32 +0000
+++ b/msdos/ChangeLog   2012-07-31 23:20:25 +0000
@@ -1,3 +1,7 @@
+2012-07-31  Glenn Morris  <address@hidden>
+
+       * sed1v2.inp (S_FILE): Update for format change.
+
 2012-07-28  Paul Eggert  <address@hidden>
 
        Use Gnulib stdalign module (Bug#9772, Bug#9960).

=== modified file 'msdos/sed1v2.inp'
--- a/msdos/sed1v2.inp  2012-07-14 10:03:30 +0000
+++ b/msdos/sed1v2.inp  2012-07-31 23:20:25 +0000
@@ -129,7 +129,7 @@
 /^MKDEPDIR *=/s/@MKDEPDIR@//
 /^version *=/s/@address@hidden@//
 /^M_FILE *=/address@hidden@!$(srcdir)/m/intel386.h!
-/^S_FILE *=/address@hidden@!$(srcdir)/s/msdos.h!
+/^S_FILE *=/s!=!= $(srcdir)/s/msdos.h!
 /address@hidden@$/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!

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-07-31 23:02:12 +0000
+++ b/src/ChangeLog     2012-07-31 23:20:25 +0000
@@ -1,5 +1,7 @@
 2012-07-31  Glenn Morris  <address@hidden>
 
+       * 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.

=== modified file 'src/Makefile.in'
--- a/src/Makefile.in   2012-07-30 21:20:43 +0000
+++ b/src/Makefile.in   2012-07-31 23:20:25 +0000
@@ -56,7 +56,8 @@
 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)