mirror of
https://salsa.debian.org/srivasta/make-dfsg.git
synced 2025-02-11 14:52:19 +00:00
Thu May 9 13:20:43 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* read.c (read_makefile): Grok `sinclude' as alias for `-include'.
This commit is contained in:
parent
4679c702de
commit
73c52a3b12
1 changed files with 7 additions and 6 deletions
11
read.c
11
read.c
|
@ -1,5 +1,5 @@
|
||||||
/* Reading and parsing of makefiles for GNU Make.
|
/* Reading and parsing of makefiles for GNU Make.
|
||||||
Copyright (C) 1988, 89, 90, 91, 92, 93, 94, 1995 Free Software Foundation, Inc.
|
Copyright (C) 1988,89,90,91,92,93,94,95,96 Free Software Foundation, Inc.
|
||||||
This file is part of GNU Make.
|
This file is part of GNU Make.
|
||||||
|
|
||||||
GNU Make is free software; you can redistribute it and/or modify
|
GNU Make is free software; you can redistribute it and/or modify
|
||||||
|
@ -558,15 +558,16 @@ read_makefile (filename, flags)
|
||||||
v->export = v_noexport;
|
v->export = v_noexport;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (word1eq ("include", 7) || word1eq ("-include", 8))
|
else if (word1eq ("include", 7) || word1eq ("-include", 8)
|
||||||
|
|| word1eq ("sinclude", 8))
|
||||||
{
|
{
|
||||||
/* We have found an `include' line specifying a nested
|
/* We have found an `include' line specifying a nested
|
||||||
makefile to be read at this point. */
|
makefile to be read at this point. */
|
||||||
struct conditionals *save, new_conditionals;
|
struct conditionals *save, new_conditionals;
|
||||||
struct nameseq *files;
|
struct nameseq *files;
|
||||||
/* "-include" (vs "include") says no
|
/* "-include" (vs "include") says no error if the file does not
|
||||||
error if the file does not exist. */
|
exist. "sinclude" is an alias for this from SGI. */
|
||||||
int noerror = p[0] == '-';
|
int noerror = p[0] != 'i';
|
||||||
|
|
||||||
p = allocated_variable_expand (next_token (p + (noerror ? 9 : 8)));
|
p = allocated_variable_expand (next_token (p + (noerror ? 9 : 8)));
|
||||||
if (*p == '\0')
|
if (*p == '\0')
|
||||||
|
|
Loading…
Reference in a new issue