Compare commits

..

8 Commits

Author SHA1 Message Date
Roland McGrath
d9f063656b . 1995-03-10 19:08:28 +00:00
Roland McGrath
aceefb74da (read_makefile, parse_file_seq): Fix typo __MS_DOS__ -> __MSDOS__. 1995-03-10 19:07:26 +00:00
Roland McGrath
f38d98e988 Regenerated for 3.72.10 1995-03-10 19:00:29 +00:00
Roland McGrath
ff8ff73e65 . 1995-03-10 18:58:47 +00:00
Roland McGrath
8478b0c10a (globfiles): Add glob/configure.bat.
(distfiles): Add configh.dos, configure.bat.
1995-03-10 18:56:38 +00:00
Roland McGrath
1adf3a07dc (read_makefile, parse_file_seq) [__MS_DOS__]: Don't see : as separator in
"C:\...".
1995-03-09 01:42:12 +00:00
Roland McGrath
a5a27a893d (STDC_HEADERS): Define only if undefined.
(HAVE_SYS_PARAM_H): Don't define this.
(HAVE_STRERROR): Define this.
1995-03-09 01:13:02 +00:00
Roland McGrath
595f7598ae (construct_command_argv_internal) [__MSDOS__]: Fix typos. 1995-03-09 01:08:14 +00:00
7 changed files with 40 additions and 8 deletions

View File

@@ -1,5 +1,23 @@
Fri Mar 10 13:56:49 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
* Version 3.72.10.
* read.c (read_makefile, parse_file_seq): Fix typo __MS_DOS__ ->
__MSDOS__.
* GNUmakefile (globfiles): Add glob/configure.bat.
(distfiles): Add configh.dos, configure.bat.
Wed Mar 8 13:10:57 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
Fixes for MS-DOS from DJ Delorie.
* read.c (read_makefile, parse_file_seq) [__MS_DOS__]: Don't see :
as separator in "C:\...".
* configh.dos (STDC_HEADERS): Define only if undefined.
(HAVE_SYS_PARAM_H): Don't define this.
(HAVE_STRERROR): Define this.
* job.c (construct_command_argv_internal) [__MSDOS__]: Fix typos.
* Version 3.72.9.
* main.c (decode_switches): Reset optind to 1 instead of 0.

View File

@@ -152,7 +152,7 @@ $(prog): $(objs) $(globdep) #$(addprefix $(ARCH)/,gmalloc.o mcheck.o)
mv -f $@.new $@
globfiles = $(addprefix glob/,COPYING.LIB configure.in configure Makefile.in \
glob.c fnmatch.c glob.h fnmatch.h)
configure.bat glob.c fnmatch.c glob.h fnmatch.h)
$(globfiles): stamp-glob ;
stamp-glob: /home/gd/gnu/libc/posix/glob.tar
-rm -rf glob
@@ -223,6 +223,7 @@ tarfiles: $(tarfiles)
distfiles=README INSTALL COPYING ChangeLog NEWS \
configure Makefile.in configure.in build.sh.in mkinstalldirs \
configh.dos configure.bat \
acconfig.h $(srcs) remote-*.c $(globfiles) \
make.texinfo make-stds.texi \
make.?? make.??s make.toc make.aux make.man texinfo.tex TAGS tags \

2
README
View File

@@ -1,4 +1,4 @@
This directory contains the 3.72.9 test release of GNU Make.
This directory contains the 3.72.10 test release of GNU Make.
All bugs reported for previous test releases have been fixed.
Some bugs surely remain.

View File

@@ -16,7 +16,9 @@
#define RETSIGTYPE void
/* Define if you have the ANSI C header files. */
#ifndef STDC_HEADERS
#define STDC_HEADERS
#endif
/* Define if `sys_siglist' is declared by <signal.h>. */
#define SYS_SIGLIST_DECLARED
@@ -49,7 +51,7 @@
#define HAVE_LIMITS_H
/* Define if you have the <sys/param.h> header file. */
#define HAVE_SYS_PARAM_H
#undef HAVE_SYS_PARAM_H
/* Define if you have the <fcntl.h> header file. */
#define HAVE_FCNTL_H
@@ -60,6 +62,7 @@
/* Define if you have the <memory.h> header file. */
#define HAVE_MEMORY_H
#define INCLUDEDIR "c:/djgpp/include"
#define LIBDIR "c:/djgpp/lib"
/* Define if you have the `strerror' function. */
#define HAVE_STRERROR
#define SCCS_GET "get"

4
job.c
View File

@@ -1497,7 +1497,7 @@ construct_command_argv_internal (line, restp, shell, ifs)
strcat (dos_bname, ".bat");
strcat (dos_bename, ".err");
}
batch = fopen(bename, "w"); /* Create a file. */
batch = fopen (dos_bename, "w"); /* Create a file. */
if (batch != NULL)
fclose (batch);
batch = fopen (dos_bname, "w");
@@ -1506,7 +1506,7 @@ construct_command_argv_internal (line, restp, shell, ifs)
fprintf (batch, "\nif errorlevel 1 del %s\n", dos_bename);
fclose (batch);
new_argv = (char **) xmalloc(2 * sizeof(char *));
new_argv[0] = strdup (bname);
new_argv[0] = strdup (dos_bname);
new_argv[1] = 0;
}
#else /* Not MSDOS. */

10
read.c
View File

@@ -723,6 +723,11 @@ read_makefile (filename, flags)
else
break;
}
#ifdef __MSDOS__
/* For MS-DOS, skip a "C:\...". */
if (p != 0 && p[1] == '\\' && isalpha (p[-1]))
p = 0;
#endif
if (p != 0)
{
struct nameseq *target;
@@ -1538,6 +1543,11 @@ parse_file_seq (stringp, stopchar, size, strip)
/* Yes, find end of next name. */
q = p;
p = find_char_unquote (q, stopchar, 1);
#ifdef __MSDOS__
/* For MS-DOS, skip a "C:\...". */
if (stopchar == ':' && p != 0 && p[1] == '\\' && isalpha (p[-1]))
p = 0;
#endif
if (p == 0)
p = q + strlen (q);

View File

@@ -1,4 +1,4 @@
char *version_string = "3.72.9";
char *version_string = "3.72.10";
/*
Local variables: