Commit 7285dc67 authored by Eli Zaretskii's avatar Eli Zaretskii
Browse files

Fix the MSDOS build as follows from 2011-05-19T06:04:16Z!rgm@gnu.org,...

Fix the MSDOS build as follows from 2011-05-19T06:04:16Z!rgm@gnu.org, 2011-05-20T00:41:03Z!rgm@gnu.org.

 config.bat: Concatenate lisp.mk onto the end of src/Makefile.
 msdos/sed1v2.inp (make-docfile commands): Recognize only if the line
 begins with a TAB.  Use $(etc) rather than a literal "../etc".
 (`sed SED-COMMAND $(srcdir)/lisp.mk`): Edit to replace with "$(lisp).
 (@lisp_frag@): Edit out.
 msdos/sedlibmk.inp (GNULIB_GROUP_MEMBER, HAVE_GROUP_MEMBER): Edit to
 zero.
 src/callproc.c (Fcall_process) [MSDOS]: Fix arguments to
 report_file_error introduced by the change from 2011-05-07.
parent 89d1bd22
2011-05-20 Eli Zaretskii <eliz@gnu.org>
* config.bat: Concatenate lisp.mk onto the end of src/Makefile.
2011-05-20 Glenn Morris <rgm@gnu.org> 2011-05-20 Glenn Morris <rgm@gnu.org>
* configure.in (lisp_frag): New output file. * configure.in (lisp_frag): New output file.
......
...@@ -211,7 +211,7 @@ if exist dir.h ren dir.h vmsdir.h ...@@ -211,7 +211,7 @@ if exist dir.h ren dir.h vmsdir.h
rem Create "makefile" from "makefile.in". rem Create "makefile" from "makefile.in".
rm -f Makefile makefile.tmp rm -f Makefile makefile.tmp
copy Makefile.in+deps.mk makefile.tmp copy Makefile.in+lisp.mk+deps.mk makefile.tmp
sed -f ../msdos/sed1v2.inp <makefile.tmp >Makefile sed -f ../msdos/sed1v2.inp <makefile.tmp >Makefile
rm -f makefile.tmp rm -f makefile.tmp
......
2011-05-20 Eli Zaretskii <eliz@gnu.org>
* sed1v2.inp (make-docfile commands): Recognize only if the line
begins with a TAB. Use $(etc) rather than a literal "../etc".
(`sed SED-COMMAND $(srcdir)/lisp.mk`): Edit to replace with "$(lisp).
(@lisp_frag@): Edit out.
* sedlibmk.inp (GNULIB_GROUP_MEMBER, HAVE_GROUP_MEMBER): Edit to
zero.
2011-05-19 Glenn Morris <rgm@gnu.org> 2011-05-19 Glenn Morris <rgm@gnu.org>
* sed1x.inp (TOOLTIP_SUPPORT, WINDOW_SUPPORT): * sed1x.inp (TOOLTIP_SUPPORT, WINDOW_SUPPORT):
......
...@@ -127,9 +127,10 @@ s/\.h\.in/.h-in/ ...@@ -127,9 +127,10 @@ s/\.h\.in/.h-in/
/^M_FILE *=/s!@M_FILE@!$(srcdir)/m/intel386.h! /^M_FILE *=/s!@M_FILE@!$(srcdir)/m/intel386.h!
/^S_FILE *=/s!@S_FILE@!$(srcdir)/s/msdos.h! /^S_FILE *=/s!@S_FILE@!$(srcdir)/s/msdos.h!
/^@SET_MAKE@$/s/@SET_MAKE@// /^@SET_MAKE@$/s/@SET_MAKE@//
/^.\$(libsrc)\/make-docfile.*>.*\/DOC/s!make-docfile!make-docfile -o ../etc/DOC! /^ [ ]*\$(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! /^ [ ]*\$(libsrc)\/make-docfile.*>.*gl-tmp/s!make-docfile!make-docfile -o gl-tmp!
/^.\$(libsrc)\/make-doc/s!>.*$!! /^.\$(libsrc)\/make-doc/s!>.*$!!
/^ [ ]*\$(libsrc)\/make-docfile /s!`[^`]*`!$(lisp)!
/^[ ]*$/d /^[ ]*$/d
/^ if test -f/,/^ fi$/c\ /^ if test -f/,/^ fi$/c\
command.com /c if exist .gdbinit rm -f _gdbinit command.com /c if exist .gdbinit rm -f _gdbinit
...@@ -161,6 +162,7 @@ s/^ [^ ]*move-if-change / update / ...@@ -161,6 +162,7 @@ s/^ [^ ]*move-if-change / update /
/^ -\{0,1\} *ln -/s/ln -f/cp -pf/ /^ -\{0,1\} *ln -/s/ln -f/cp -pf/
/^[ ]touch /s/touch/djecho $@ >/ /^[ ]touch /s/touch/djecho $@ >/
s/@YMF_PASS_LDFLAGS@/flags/ s/@YMF_PASS_LDFLAGS@/flags/
s/@lisp_frag@//
s/@deps_frag@// s/@deps_frag@//
s/@ns_frag@// s/@ns_frag@//
s/@PRE_EDIT_LDFLAGS@// s/@PRE_EDIT_LDFLAGS@//
......
...@@ -197,6 +197,7 @@ am__cd = cd ...@@ -197,6 +197,7 @@ am__cd = cd
/^GNULIB_GETSUBOPT *=/s/@GNULIB_GETSUBOPT@/0/ /^GNULIB_GETSUBOPT *=/s/@GNULIB_GETSUBOPT@/0/
/^GNULIB_GETUSERSHELL *=/s/@GNULIB_GETUSERSHELL@/0/ /^GNULIB_GETUSERSHELL *=/s/@GNULIB_GETUSERSHELL@/0/
/^GNULIB_GRANTPT *=/s/@GNULIB_GRANTPT@/0/ /^GNULIB_GRANTPT *=/s/@GNULIB_GRANTPT@/0/
/^GNULIB_GROUP_MEMBER *=/s/@GNULIB_GROUP_MEMBER@/0/
/^GNULIB_LCHMOD *=/s/@GNULIB_LCHMOD@/0/ /^GNULIB_LCHMOD *=/s/@GNULIB_LCHMOD@/0/
/^GNULIB_LCHOWN *=/s/@GNULIB_LCHOWN@/0/ /^GNULIB_LCHOWN *=/s/@GNULIB_LCHOWN@/0/
/^GNULIB_LINK *=/s/@GNULIB_LINK@/0/ /^GNULIB_LINK *=/s/@GNULIB_LINK@/0/
...@@ -328,6 +329,7 @@ am__cd = cd ...@@ -328,6 +329,7 @@ am__cd = cd
/^HAVE_GETPAGESIZE *=/s/@HAVE_GETPAGESIZE@/1/ /^HAVE_GETPAGESIZE *=/s/@HAVE_GETPAGESIZE@/1/
/^HAVE_GETSUBOPT *=/s/@HAVE_GETSUBOPT@/0/ /^HAVE_GETSUBOPT *=/s/@HAVE_GETSUBOPT@/0/
/^HAVE_GRANTPT *=/s/@HAVE_GRANTPT@/0/ /^HAVE_GRANTPT *=/s/@HAVE_GRANTPT@/0/
/^HAVE_GROUP_MEMBER *=/s/@HAVE_GROUP_MEMBER@/0/
/^HAVE_LCHOWN *=/s/@HAVE_LCHOWN@/0/ /^HAVE_LCHOWN *=/s/@HAVE_LCHOWN@/0/
/^HAVE_INTTYPES_H *=/s/@HAVE_INTTYPES_H@/HAVE_INTTYPES_H/ /^HAVE_INTTYPES_H *=/s/@HAVE_INTTYPES_H@/HAVE_INTTYPES_H/
/^HAVE_LCHMOD *=/s/@HAVE_LCHMOD@/0/ /^HAVE_LCHMOD *=/s/@HAVE_LCHMOD@/0/
......
2011-05-20 Eli Zaretskii <eliz@gnu.org>
* callproc.c (Fcall_process) [MSDOS]: Fix arguments to
report_file_error introduced by the change from 2011-05-07.
2011-05-20 Paul Eggert <eggert@cs.ucla.edu> 2011-05-20 Paul Eggert <eggert@cs.ucla.edu>
* systime.h (Time): Define only if emacs is defined. * systime.h (Time): Define only if emacs is defined.
...@@ -176,11 +181,11 @@ ...@@ -176,11 +181,11 @@
(Fget_screen_color): New function. (Fget_screen_color): New function.
(syms_of_ntterm): Defsubr it. (syms_of_ntterm): Defsubr it.
* callproc.c (call_process_cleanup): Don't close and unlink the * callproc.c (call_process_cleanup) [MSDOS]: Don't close and
temporary file if Fcall_process didn't create it in the first unlink the temporary file if Fcall_process didn't create it in the
place. first place.
(Fcall_process): Don't create tempfile if stdout of the child (Fcall_process) [MSDOS]: Don't create tempfile if stdout of the
process will be redirected to a file specified with `:file'. child process will be redirected to a file specified with `:file'.
Don't try to re-open tempfile in that case, and set fd[0] to -1 as Don't try to re-open tempfile in that case, and set fd[0] to -1 as
cue to call_process_cleanup not to close that handle. cue to call_process_cleanup not to close that handle.
......
...@@ -577,7 +577,7 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS) */) ...@@ -577,7 +577,7 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS) */)
unlink (tempfile); unlink (tempfile);
emacs_close (filefd); emacs_close (filefd);
report_file_error ("Cannot re-open temporary file", report_file_error ("Cannot re-open temporary file",
Fcons (tempfile, Qnil)); Fcons (build_string (tempfile), Qnil));
} }
} }
else else
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment