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

* A few W32 fixes for backslash support.

Browse Source
This commit is contained in:
Paul Smith 1999-09-02 00:31:21 +00:00
parent 82f0c5495a
commit 10fee1c03c
5 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,5 +1,12 @@
1999-09-01 Paul D. Smith <psmith@gnu.org> 1999-09-01 Paul D. Smith <psmith@gnu.org>
* function.c (IS_PATHSEP) [WINDOWS32]: Allow backslash separators
for W32 platforms.
* read.c (record_files) [WINDOWS32]: Allow backslash separators
for W32 platforms.
* implicit.c (pattern_search) [WINDOWS32]: Allow backslash
separators for W32 platforms.
* configure.in (MAKE_HOST): Define it to be the canonical build * configure.in (MAKE_HOST): Define it to be the canonical build
host info, now that we need AC_CANONICAL_HOST anyway (for large host info, now that we need AC_CANONICAL_HOST anyway (for large
file support). file support).

2
function.c
View File

@ -472,7 +472,7 @@ func_origin(o, argv, funcname)
#ifdef VMS #ifdef VMS
#define IS_PATHSEP(c) ((c) == ']') #define IS_PATHSEP(c) ((c) == ']')
#else #else
#ifdef __MSDOS__ #if defined(__MSDOS__) || defined(WINDOWS32)
#define IS_PATHSEP(c) ((c) == '/' || (c) == '\\') #define IS_PATHSEP(c) ((c) == '/' || (c) == '\\')
#else #else
#define IS_PATHSEP(c) ((c) == '/') #define IS_PATHSEP(c) ((c) == '/')

2
implicit.c
View File

@ -168,7 +168,7 @@ pattern_search (file, archive, depth, recursions)
lastslash = rindex (filename, ']'); lastslash = rindex (filename, ']');
#else #else
lastslash = rindex (filename, '/'); lastslash = rindex (filename, '/');
#ifdef __MSDOS__ #if defined(__MSDOS__) || defined(WINDOWS32)
/* Handle backslashes (possibly mixed with forward slashes) /* Handle backslashes (possibly mixed with forward slashes)
and the case of "d:file". */ and the case of "d:file". */
{ {

8
main.c
View File

@ -2540,18 +2540,20 @@ print_version ()
/* Do it only once. */ /* Do it only once. */
return; return;
printf ("%sGNU Make %s (%s)", precede, version_string, make_host); printf ("%sGNU Make %s", precede, version_string);
if (remote_description != 0 && *remote_description != '\0') if (remote_description != 0 && *remote_description != '\0')
printf ("-%s", remote_description); printf ("-%s", remote_description);
printf (_(", by Richard Stallman and Roland McGrath.\n\ printf (_(" (%s)\n\
%s by Richard Stallman and Roland McGrath.\n\
%sCopyright (C) 1988, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99\n\ %sCopyright (C) 1988, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99\n\
%s\tFree Software Foundation, Inc.\n\ %s\tFree Software Foundation, Inc.\n\
%sThis is free software; see the source for copying conditions.\n\ %sThis is free software; see the source for copying conditions.\n\
%sThere is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A\n\ %sThere is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A\n\
%sPARTICULAR PURPOSE.\n\n\ %sPARTICULAR PURPOSE.\n\n\
%sReport bugs to <bug-make@gnu.org>.\n\n"), %sReport bugs to <bug-make@gnu.org>.\n\n"),
precede, precede, precede, precede, precede, precede); make_host,
precede, precede, precede, precede, precede, precede, precede);
printed_version = 1; printed_version = 1;

6
read.c
View File

@ -692,7 +692,9 @@ read_makefile (filename, flags)
| (noerror ? RM_DONTCARE : 0))) | (noerror ? RM_DONTCARE : 0)))
&& ! noerror) && ! noerror)
error (&fileinfo, "%s: %s", name, strerror (errno)); error (&fileinfo, "%s: %s", name, strerror (errno));
free(name);
/* We can't free NAME here, in case some of the commands,
etc. still contain references to the filename. */
} }
/* Free any space allocated by conditional_line. */ /* Free any space allocated by conditional_line. */
@ -1725,7 +1727,7 @@ record_files (filenames, pattern, pattern_percent, deps, cmds_started,
not start with a `.', unless it contains a slash. */ not start with a `.', unless it contains a slash. */
if (default_goal_file == 0 && set_default if (default_goal_file == 0 && set_default
&& (*name != '.' || index (name, '/') != 0 && (*name != '.' || index (name, '/') != 0
#ifdef __MSDOS__ #if defined(__MSDOS__) || defined(WINDOWS32)
|| index (name, '\\') != 0 || index (name, '\\') != 0
#endif #endif
)) ))