github-repos/make
1
0
Fork 0
mirror of https://github.com/mirror/make.git synced 2025-02-05 09:10:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Various bug fixes.

Browse Source
This commit is contained in:
Paul Smith 1999-06-14 05:26:28 +00:00
parent fc0fe4103a
commit 187787286d
5 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ChangeLog
View File

@ -1,8 +1,22 @@
1999-04-26 Paul D. Smith <psmith@gnu.org>
* main.c (main): Reset read_makefiles to empty after processing so
we get the right error message.
1999-04-25 Paul D. Smith <psmith@gnu.org> 1999-04-25 Paul D. Smith <psmith@gnu.org>
* make.texinfo: Updates to @dircategory and @direntry suggested by * make.texinfo: Updates to @dircategory and @direntry suggested by
Karl Berry <karl@cs.umb.edu>. Karl Berry <karl@cs.umb.edu>.
1999-04-23 Eli Zaretskii <eliz@is.elta.co.il>
* job.c (start_job_command) [__MSDOS__]: Call unblock_sigs before
turning off dos_command_running, so child's signals produce the
right effect.
* commands.c (fatal_error_signal) [__MSDOS__]: Use EXIT_FAILURE
instead of 1.
1999-04-18 Eli Zaretskii <eliz@is.elta.co.il> 1999-04-18 Eli Zaretskii <eliz@is.elta.co.il>
* configh.dos.template: Update to recognize that version 2.02 of * configh.dos.template: Update to recognize that version 2.02 of

2
commands.c
View File

@ -380,7 +380,7 @@ fatal_error_signal (sig)
return; return;
} }
remove_intermediates (1); remove_intermediates (1);
exit (1); exit (EXIT_FAILURE);
#else /* not __MSDOS__ */ #else /* not __MSDOS__ */
#ifdef _AMIGA #ifdef _AMIGA
remove_intermediates (1); remove_intermediates (1);

2
expand.c
View File

@ -398,7 +398,7 @@ char *
variable_expand (line) variable_expand (line)
char *line; char *line;
{ {
return variable_expand_string(NULL, line, -1); return variable_expand_string(NULL, line, (long)-1);
} }
/* Expand an argument for an expansion function. /* Expand an argument for an expansion function.

10
job.c
View File

@ -1024,7 +1024,6 @@ start_job_command (child)
dos_command_running = 1; dos_command_running = 1;
proc_return = system (cmdline); proc_return = system (cmdline);
dos_command_running = 0;
environ = parent_environ; environ = parent_environ;
execute_by_shell = 0; /* for the next time */ execute_by_shell = 0; /* for the next time */
} }
@ -1032,9 +1031,16 @@ start_job_command (child)
{ {
dos_command_running = 1; dos_command_running = 1;
proc_return = spawnvpe (P_WAIT, argv[0], argv, child->environment); proc_return = spawnvpe (P_WAIT, argv[0], argv, child->environment);
dos_command_running = 0;
} }
/* Need to unblock signals before turning off
dos_command_running, so that child's signals
will be treated as such (see fatal_error_signal). */
unblock_sigs ();
dos_command_running = 0;
/* If the child got a signal, dos_status has its
high 8 bits set, so be careful not to alter them. */
if (proc_return == -1) if (proc_return == -1)
dos_status |= 0xff; dos_status |= 0xff;
else else

5
main.c
View File

@ -1496,10 +1496,13 @@ int main (int argc, char ** argv)
else else
{ {
/* A normal makefile. We must die later. */ /* A normal makefile. We must die later. */
error (NILF, "Makefile `%s' was not found", dep_name (d)); error (NILF, "Makefile `%s' was not found",
dep_name (d));
any_failed = 1; any_failed = 1;
} }
} }
/* Reset this to empty so we get the right error message below. */
read_makefiles = 0;
if (any_remade) if (any_remade)
goto re_exec; goto re_exec;