diff options
| author | Glenn Morris <[email protected]> | 2012-07-31 19:20:25 -0400 |
|---|---|---|
| committer | Glenn Morris <[email protected]> | 2012-07-31 19:20:25 -0400 |
| commit | bc96620af40d80c4ccfb45671388c0640721fda1 (patch) | |
| tree | 08f309485838c98ae92858e5a137df951d1a86a4 | |
| parent | 68169a334979326ce18b81df8874a34bccc425b9 (diff) | |
* 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.
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | msdos/ChangeLog | 4 | ||||
| -rw-r--r-- | msdos/sed1v2.inp | 2 | ||||
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/Makefile.in | 3 |
6 files changed, 11 insertions, 4 deletions
@@ -1,5 +1,7 @@ 2012-07-31 Glenn Morris <[email protected]> + * 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 7b8766b0c5..cf4e0540d2 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 c5b509c72a..503c7cbf8a 100644 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog @@ -1,3 +1,7 @@ +2012-07-31 Glenn Morris <[email protected]> + + * sed1v2.inp (S_FILE): Update for format change. + 2012-07-28 Paul Eggert <[email protected]> Use Gnulib stdalign module (Bug#9772, Bug#9960). diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp index 7a43697a06..1fd81ba0e4 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 ccbb5ae576..9b8de9ff23 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2012-07-31 Glenn Morris <[email protected]> + * 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 1ea7d162b1..b8298dfa10 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) |