procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* configure.ac (S_FILE): Remove output variable.

Browse source 
* src/Makefile.in (S_FILE): No longer set by configure.

* msdos/sed1v2.inp (S_FILE): Update for format change.
This commit is contained in:
Glenn Morris 2012-07-31 19:20:25 -04:00
parent 68169a3349
commit bc96620af4
6 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

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

2
configure.ac
View file

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

4
msdos/ChangeLog
View file

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

2
msdos/sed1v2.inp
View file

@ -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!

2
src/ChangeLog
View file

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

3
src/Makefile.in
View file

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