Regenerated for 3.74

[_AIX] (LOAD_AVE_TYPE, FSCALE, NLIST_STRUCT): Define these for AIX.
(getloadavg) [_AIX]: Use `knlist' instead of `nlist'.

GNUmakefile

@@ -50,7 +50,7 @@ exec_prefix = $(prefix)
 extras := $(filter-out getloadavg.o @%@,$(extras)) getloadavg.o
 LOADLIBES := $(filter-out @%@,$(LOADLIBES))
 ALLOCA := $(filter-out @%@,$(ALLOCA))
-CPPFLAGS := $(filter-out @%@,$(CPPFLAGS)) -DHAVE_CONFIG_H
+CPPFLAGS := $(filter-out @%@,$(defines) $(CPPFLAGS)) -DHAVE_CONFIG_H
 
 ifdef AC_MACRODIR
 configure config.h.in: $(patsubst %,$(AC_MACRODIR)/%.m4,acspecific acgeneral)

Makefile.in

@@ -216,6 +216,7 @@ $(infodir)/make.info: make.info
 # We use `$(SHELL) -c' because some shells do not
 # fail gracefully when there is an unknown command.
 	if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
+	  if [ -r ./make.info ]; then dir=.; else dir=$(srcdir); fi; \
 	  install-info --infodir=$(infodir) $$dir/make.info; \
 	else true; fi
 
@@ -284,7 +285,7 @@ $(objs): config.h
 commands.o : commands.c make.h dep.h commands.h file.h variable.h job.h 
 job.o: job.c make.h commands.h job.h file.h variable.h
 dir.o: dir.c make.h
-file.o : file.c make.h commands.h dep.h file.h variable.h 
+file.o: file.c make.h commands.h dep.h file.h variable.h
 misc.o: misc.c make.h dep.h
 main.o: main.c make.h commands.h dep.h file.h variable.h job.h getopt.h
 read.o: read.c make.h commands.h dep.h file.h variable.h glob/glob.h
@@ -294,7 +295,7 @@ implicit.o : implicit.c make.h rule.h dep.h file.h
 default.o: default.c make.h rule.h dep.h file.h commands.h variable.h
 variable.o : variable.c make.h commands.h variable.h dep.h file.h 
 expand.o: expand.c make.h commands.h file.h variable.h
-function.o : function.c make.h variable.h dep.h commands.h job.h 
+function.o: function.c make.h variable.h dep.h commands.h job.h
 vpath.o : vpath.c make.h file.h variable.h 
 version.o: version.c
 ar.o : ar.c make.h file.h dep.h 

README

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

compatMakefile

@@ -216,6 +216,7 @@ $(infodir)/make.info: make.info
 # We use `$(SHELL) -c' because some shells do not
 # fail gracefully when there is an unknown command.
 	if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
+	  if [ -r ./make.info ]; then dir=.; else dir=$(srcdir); fi; \
 	  install-info --infodir=$(infodir) $$dir/make.info; \
 	else true; fi
 

file.c

@@ -1,5 +1,5 @@
 /* Target file hash table management for GNU Make.
-Copyright (C) 1988, 89, 90, 91, 92, 93, 94 Free Software Foundation, Inc.
+Copyright (C) 1988, 89, 90, 91, 92, 93, 94, 1995 Free Software Foundation, Inc.
 This file is part of GNU Make.
 
 GNU Make is free software; you can redistribute it and/or modify
@@ -21,6 +21,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "dep.h"
 #include "file.h"
 #include "variable.h"
+#include <assert.h>
 
 
 /* Hash table of files the makefile knows how to make.  */
@@ -294,7 +295,9 @@ remove_intermediates (sig)
   register struct file *f;
   char doneany;
   
-  if (!sig && just_print_flag)
+  if (question_flag || touch_flag)
+    return;
+  if (sig && just_print_flag)
     return;
 
   doneany = 0;
@@ -303,7 +306,11 @@ remove_intermediates (sig)
       if (f->intermediate && (f->dontcare || !f->precious))
 	{
 	  int status;
-	  if (just_print_flag)
+	  if (f->update_status == -1)
+	    /* If nothing would have created this file yet,
+	       don't print an "rm" command for it.  */
+	    continue;
+	  else if (just_print_flag)
 	    status = 0;
 	  else
 	    {
@@ -491,6 +498,10 @@ print_file (f)
 	  puts ("#  Successfully updated.");
 	  break;
 	case 1:
+	  assert (question_flag);
+	  puts ("#  Needs to be updated (-q is set).");
+	  break;
+	case 2:
 	  puts ("#  Failed to be updated.");
 	  break;
 	default:

function.c

@@ -1,5 +1,5 @@
 /* Variable function expansion for GNU Make.
-Copyright (C) 1988, 1989, 1991, 1992, 1993, 1994 Free Software Foundation, Inc.
+Copyright (C) 1988, 89, 91, 92, 93, 94, 95 Free Software Foundation, Inc.
 This file is part of GNU Make.
 
 GNU Make is free software; you can redistribute it and/or modify
@@ -24,6 +24,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #ifdef __MSDOS__
 #include <process.h>
+#include <fcntl.h>
 #endif
 
 static char *string_glob ();

getloadavg.c

@@ -210,6 +210,10 @@ extern int errno;
 #define LOAD_AVE_TYPE long
 #endif
 
+#ifdef _AIX
+#define LOAD_AVE_TYPE long
+#endif
+
 #endif /* No LOAD_AVE_TYPE.  */
 
 #ifdef OSF_ALPHA
@@ -254,6 +258,10 @@ extern int errno;
 #define FSCALE 100.0
 #endif
 
+#ifdef _AIX
+#define FSCALE 65536.0
+#endif
+
 #endif	/* Not FSCALE.  */
 
 #if !defined (LDAV_CVT) && defined (FSCALE)
@@ -315,6 +323,10 @@ extern int errno;
 #define NLIST_STRUCT
 #endif
 
+#ifdef _AIX
+#define NLIST_STRUCT
+#endif
+
 #endif /* defined (NLIST_STRUCT) */
 
 
@@ -340,7 +352,7 @@ extern int errno;
 #define LDAV_SYMBOL "_Loadavg"
 #endif
 
-#if !defined(LDAV_SYMBOL) && ((defined(hpux) && !defined(hp9000s300)) || defined(_SEQUENT_) || defined(SVR4) || defined(ISC) || defined(sgi) || (defined (ardent) && defined (titan)))
+#if !defined(LDAV_SYMBOL) && ((defined(hpux) && !defined(hp9000s300)) || defined(_SEQUENT_) || defined(SVR4) || defined(ISC) || defined(sgi) || (defined (ardent) && defined (titan)) || defined (_AIX))
 #define LDAV_SYMBOL "avenrun"
 #endif
 
@@ -790,23 +802,29 @@ getloadavg (loadavg, nelem)
 #endif /* NLIST_STRUCT */
 
 #ifndef SUNOS_5
-      if (nlist (KERNEL_FILE, nl) >= 0)
-	/* Omit "&& nl[0].n_type != 0 " -- it breaks on Sun386i.  */
-	{
-#ifdef FIXUP_KERNEL_SYMBOL_ADDR
-	  FIXUP_KERNEL_SYMBOL_ADDR (nl);
+      if (
+#ifndef _AIX
+	  nlist (KERNEL_FILE, nl)
+#else  /* _AIX */
+	  knlist (nl, 1, sizeof (nl[0]))
 #endif
-	  offset = nl[0].n_value;
-	}
-#endif  /* !SUNOS_5 */
-#else /* sgi */
-      int ldav_off;
+	  >= 0)
+	  /* Omit "&& nl[0].n_type != 0 " -- it breaks on Sun386i.  */
+	  {
+#ifdef FIXUP_KERNEL_SYMBOL_ADDR
+	    FIXUP_KERNEL_SYMBOL_ADDR (nl);
+#endif
+	    offset = nl[0].n_value;
+	  }
+#endif /* !SUNOS_5 */
+#else  /* sgi */
+	  int ldav_off;
 
-      ldav_off = sysmp (MP_KERNADDR, MPKA_AVENRUN);
-      if (ldav_off != -1)
-	offset = (long) ldav_off & 0x7fffffff;
+	  ldav_off = sysmp (MP_KERNADDR, MPKA_AVENRUN);
+	  if (ldav_off != -1)
+	  offset = (long) ldav_off & 0x7fffffff;
 #endif /* sgi */
-    }
+	}
 
   /* Make sure we have /dev/kmem open.  */
   if (!getloadavg_initialized)

glob/ChangeLog

@@ -1,3 +1,15 @@
+Sat Apr 29 15:46:57 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
+
+	* posix/glob.c (S_ISDIR): Define if undefined.
+
+Tue Apr 25 17:17:19 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
+
+	* posix/glob.c (glob): If GLOB_MARK set, stat names to find
+ 	directories and append slashes to them in final pass before
+ 	sorting.
+	(glob_in_dir): If GLOB_MARK set, just allocate the extra char for the
+	slash; never append it here.
+
 Wed Mar  8 13:38:13 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
 
 	* posix/glob/configure.bat: Fixes from DJ.
@@ -43,273 +55,3 @@ Sun Jan 15 06:56:47 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
 
 	* posix/glob/configure.in: Add AC_CONST check.
 
-Wed Dec  7 14:05:12 1994  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
-
-	* posix/glob/Makefile.in (realclean): Remove config.status.
-
-	* posix/glob/Makefile.in (DEFS): New variable, set from @DEFS@.
-	(CPPFLAGS): Remove @DEFS@ from here.
-	(.c.o): Use $(DEFS).
-
-Tue Dec  6 19:04:50 1994  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
-
-	* posix/glob/Makefile.in (CPPFLAGS): Include @DEFS@.
-
-Mon Dec  5 12:05:10 1994  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
-
-	* posix/glob/configure.in: Add AC_PROG_CC.
-
-Mon Nov  7 00:38:45 1994  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
-
-	* posix/glob/configure.in: Converted to Autoconf v2.
-	* posix/glob.c: Test HAVE_DIRENT_H, HAVE_SYS_DIR_H, HAVE_NDIR_H
-	instead of DIRENT, SYSDIR, NDIR.
-	* posix/glob/Makefile.in (CC): New variable, set from @CC@.
-	(CPPFLAGS): Set from @CPPFLAGS@, not @DEFS@.
-
-Sun Oct 09 01:19:38 1994  Jim Meyering  (meyering@comco.com)
-
-	* posix/fnmatch.c: Remove CONFIG_BROKETS conditional.
-
-Sun Oct  2 18:35:16 1994  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
-
-	* posix/glob.h (__P): Change arg name to `protos', for congruence
-        with 4.4 BSD.
-	* posix/fnmatch.h (__P): Likewise.
-
-Tue Sep  6 19:06:00 1994  Roland McGrath  <roland@geech.gnu.ai.mit.edu>
-
-	* posix/glob.c (prefix_array, glob): Avoid const on initialized
-	variables.  Some compiler generates bad code.
-
-Mon Jul 25 17:17:28 1994  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
-
-	* posix/glob/configure.bat: New file.
-	* posix/Makefile (glob.tar): Add glob/configure.bat.
-
-Tue Dec 14 13:08:35 1993  Roland McGrath  (roland@churchy.gnu.ai.mit.edu)
-
-	* posix/fnmatch.h: #undef FNM_PATHNAME, FNM_NOESCAPE, and
-	FNM_PERIOD before defining them.
-
-Mon Oct 18 04:22:42 1993  Roland McGrath  (roland@churchy.gnu.ai.mit.edu)
-
-	* posix/glob/configure.in: Use AC_HAVE_HEADERS instead of
-	AC_MEMORY_H and AC_UNISTD_H; omit AC_USG (not needed).
-
-Sun Oct 10 14:31:35 1993  Jim Meyering  (meyering@comco.com)
-
-	* posix/fnmatch.c [CONFIG_BROKETS]: Include <config.h> only under
-	this condition, else "config.h".
-
-Wed May 12 16:24:23 1993  Roland McGrath  (roland@geech.gnu.ai.mit.edu)
-
-	* posix/glob.c: Move include <unistd.h> before dir includes.
-	[HAVE_UNISTD_H] [! POSIX] [_POSIX_SOURCE]: Define POSIX.
-
-Thu Apr 22 17:40:28 1993  Roland McGrath  (roland@churchy.gnu.ai.mit.edu)
-
-	* posix/glob/Makefile.in (.c.o): Put $(CFLAGS) last.
-	(glob.o): Depend on glob.c.
-	(fnmatch.o): Depend on fnmatch.c.
-
-Fri Apr 16 12:24:21 1993  Roland McGrath  (roland@churchy.gnu.ai.mit.edu)
-
-	* posix/glob.c, posix/fnmatch.c: Surround code with 
-	#if defined (_LIBC) || !defined (__GNU_LIBRARY__)
-
-Wed Apr 14 12:49:10 1993  Roland McGrath  (roland@churchy.gnu.ai.mit.edu)
-
-	* posix/glob.c [USG, NeXT]: Don't test these.
-	[HAVE_STRING_H]: Test this to include string.h and define ANSI_STRING.
-	[HAVE_MEMORY_H]: Test this instead of NEED_MEMORY_H.
-	[! ANSI_STRING]: Put decls of bcopy and #define of memcpy et al here.
-
-	* posix/fnmatch.c [HAVE_CONFIG_H]: #include "config.h".
-
-Mon Apr 12 16:34:53 1993  Roland McGrath  (roland@churchy.gnu.ai.mit.edu)
-
-	* posix/glob.c: Rationalize directory header conditionals.
-
-Sun Apr 11 18:53:50 1993  Roland McGrath  (roland@churchy.gnu.ai.mit.edu)
-
-	* posix/fnmatch.h [__cplusplus || __STDC__]: Don't #define const.
-
-Sun Mar 28 16:12:33 1993  Roland McGrath  (roland@geech.gnu.ai.mit.edu)
-
-	* posix/fnmatch.c (case '*'): Before final loop, fold C1, rather
-	than foling *P before it goes into C1.  C might need folding instead.
-
-Thu Mar 25 13:40:17 1993  Roland McGrath  (roland@churchy.gnu.ai.mit.edu)
-
-	* posix/fnmatch.h [!_POSIX_C_SOURCE || ...]: Make this test
-	_GNU_SOURCE, not _BSD_SOURCE; these are our extensions, not theirs.
-	(FNM_CASEFOLD): New bit.
-	(__FNM_FLAGS): Removed macro.
-	* posix/fnmatch.c (fnmatch): Don't test for bogus flag bits; who cares?
-	(FOLD): New macro to casefold a char if FNM_CASEFOLD.
-	Use it to fold all chars before comparison.
-
-Mon Mar  8 13:20:02 1993  Roland McGrath  (roland@geech.gnu.ai.mit.edu)
-
-	* posix/glob/Makefile.in (VPATH): Set this to @srcdir@.
-	(srcdir): Set this to $(VPATH).
-
-	* posix/glob.c (glob): In no matches with GLOB_NOCHECK set case,
-	add NULL terminator to PGLOB->gl_pathv.
-	(prefix_array): Renamed arg PREFIX to DIRNAME, local var PRELEN to
-	DIRLEN.  If DIRNAME is just "/", don't prepend it, so we get
-	"/foo" instead of "//foo".
-	(glob): Move qsort call outside of the else clause of the
-	glob_pattern_p test; it should always be done.
-
-Thu Jan 21 20:12:25 1993  Roland McGrath  (roland@geech.gnu.ai.mit.edu)
-
-	* posix/glob.c: Put #includes of <glob.h> and <fnmatch.h> after
-	all system includes, in case one of them has conflicting defns of
-	FNM_* or GLOB_*, so we will redefine.  #undef FNM_* and GLOB_*
-	before including our headers.
-
-Tue Jan 19 16:16:05 1993  Roland McGrath  (roland@geech.gnu.ai.mit.edu)
-
-	* posix/glob.c (my_realloc): Cast result of malloc/realloc to (char *).
-
-Thu Jan 14 13:52:43 1993  Roland McGrath  (roland@churchy.gnu.ai.mit.edu)
-
-	* posix/glob/Makefile.in (realclean): Remove Makefile.
-
-Mon Jan  4 17:05:44 1993  Roland McGrath  (roland@geech.gnu.ai.mit.edu)
-
-	* posix/glob/Makefile.in (RANLIB): Define to @RANLIB@.
-	(RANLIB_TEST): Removed.
-	(libglob.a): Don't use it.
-
-Mon Dec 28 15:50:31 1992  Roland McGrath  (roland@churchy.gnu.ai.mit.edu)
-
-	* posix/glob.c [HAVE_CONFIG_H]: Test this, not SHELL, to decide
-	whether or not we want to #include "config.h".
-
-Wed Nov 18 13:42:09 1992  Roland McGrath  (roland@churchy.gnu.ai.mit.edu)
-
-	* posix/fnmatch.h (FNM_LEADING_DIR): New flag.
-	* posix/fnmatch.c (fnmatch): Support it.
-
-Sun Oct 11 16:58:36 1992  Roland McGrath  (roland@churchy.gnu.ai.mit.edu)
-
-	* posix/glob.c (__glob_{open,read,close}dir_hook): New vars.
-	(glob_in_dir): Use them.
-	* posix/glob.h: Declare them.
-
-Fri Sep 18 16:32:16 1992  Roland McGrath  (roland@geech.gnu.ai.mit.edu)
-
-	* posix/glob/Makefile.in (AR, ARFLAGS): Define.
-	(libglob.a): Use those vars instead of hardcoding.
-
-Thu Aug 13 18:30:58 1992  Roland McGrath  (roland@churchy.gnu.ai.mit.edu)
-
-	* posix/glob.c: Always #include <sys/types.h>.
-	[! USG]: Don't do it here.
-	[STDC_HEADERS]: Test this instead of __STDC__ for size_t.
-	[HAVE_STRCOLL]: Test this instead of ANSI_STRING for strcoll.
-
-	* posix/glob/Makefile.in (Makefile): Remove rule.
-
-Tue Aug 11 15:01:50 1992  Roland McGrath  (roland@geech.gnu.ai.mit.edu)
-
-	* posix/glob.c [_AIX]: Don't declare alloca.
-
-Thu Jul 30 15:42:01 1992  Roland McGrath  (roland@geech.gnu.ai.mit.edu)
-
-	* posix/glob/Makefile.in (Makefile): Depend on config.status; invoke
-	it directly instead of using $(SHELL).
-
-	* posix/glob.c [! USG]: #include <sys/types.h> before <sys/dir.h>.
-
-Sun Jul 26 17:03:31 1992  Roland McGrath  (roland@churchy.gnu.ai.mit.edu)
-
-	* posix/glob.c [_AIX]: #pragma alloca first thing.
-	[ANSI_STRING]: Remove #define's for index et al.
-
-Thu Jul  9 21:27:39 1992  Roland McGrath  (roland@churchy.gnu.ai.mit.edu)
-
-	* posix/glob.c [STDC_STRINGS]: Don't test this.
-	[! ANSI_STRING]: Put memcpy, strrchr, memset defns here instead.
-
-	* posix/glob/Makefile.in (glob.o, fnmatch.o): / after $(srcdir).
-
-Sat Jul  4 20:44:42 1992  Roland McGrath  (roland@churchy.gnu.ai.mit.edu)
-
-	* posix/glob/Makefile.in (glob.o, fnmatch.o): Put $(srcdir) on deps.
-
-Wed Jul  1 00:13:40 1992  Roland McGrath  (roland@churchy.gnu.ai.mit.edu)
-
-	* posix/glob.c [! ANSI_STRING]: #define strcoll to strcmp.
-	Remove extra decls of free, qsort, malloc, and realloc.
-
-Wed Jun 24 19:09:04 1992  Roland McGrath  (roland@churchy.gnu.ai.mit.edu)
-
-	* posix/glob.c [DIRENT] (direct): Don't define to dirent.
-	[! DIRENT] (direct): Define to dirent.
-
-Wed Jun 17 17:58:05 1992  Roland McGrath  (roland@geech.gnu.ai.mit.edu)
-
-	* posix/glob.c (my_realloc): Test only __GNU_LIBRARY__.  Can't trust
-	STDC_HEADERS.
-
-Tue Jun 16 20:20:01 1992  Roland McGrath  (roland@churchy.gnu.ai.mit.edu)
-
-	* posix/glob/Makefile: Moved to posix/glob/Makefile.in.
-	(VPATH, srcdir, CPPFLAGS): Define to be replaced by autoconf.
-
-	* posix/glob.c: Rearranged conditionals for use with autoconf.
-
-Tue Jun  9 20:15:12 1992  Roland McGrath  (roland@geech.gnu.ai.mit.edu)
-
-	* posix/glob/Makefile: Fixed copyright notice.
-	(realclean): Don't remove ~ backup files.
-
-Tue Jun  2 21:49:22 1992  Roland McGrath  (roland@geech.gnu.ai.mit.edu)
-
-	* posix/glob.c (__ptr_t): Define.
-
-Wed May 27 18:09:40 1992  Roland McGrath  (roland@geech.gnu.ai.mit.edu)
-
-	* posix/fnmatch.h (FNM_FILE_NAME): Alias for FNM_PATHNAME.
-
-Fri May 22 01:52:04 1992  Roland McGrath  (roland@geech.gnu.ai.mit.edu)
-
-	* posix/glob.h, posix/fnmatch.h: Use explicit cruft for C++.
-	Define __P and const for C++/ANSI vs old C ourselves, to avoid
-	dependence on <sys/cdefs.h>.
-
-Sun May 17 15:50:00 1992  Roland McGrath  (roland@albert.gnu.ai.mit.edu)
-
-	* posix/glob.c (glob): Don't let us fall off the end without returning.
-
-Thu May 14 01:45:12 1992  Roland McGrath  (roland@geech.gnu.ai.mit.edu)
-
-	* posix/glob.h (GLOB_MAGCHAR): Check user feature-test macros,
-	rather than __USE_BSD, so we don't depend on features.h.
-
-	* posix/glob.h [__USE_BSD] (GLOB_MAGCHAR): Declare.
-	(glob_t): Added member `gl_flags'.
-	* posix/glob.c (glob, glob_in_dir): Set gl_flags member to FLAGS;
-	or in GLOB_MAGCHAR if any metachars are seen.
-
-Thu Jan 16 18:43:05 1992  Roland McGrath  (roland@albert.gnu.ai.mit.edu)
-
-	* posix/glob.c [sgi]: No alloca.h, after all.
-
-Fri Oct 18 15:27:58 1991  Roland McGrath  (roland@churchy.gnu.ai.mit.edu)
-
-	* posix/glob.c [sgi]: Use <sys/dir.h>.
-
-Tue Jul 23 14:11:29 1991  Roland McGrath  (roland@churchy.gnu.ai.mit.edu)
-
-	* posix/glob.c: Don't #include <stddef.h> #ifdef sun.
-	Is there anyone on the face of the planet other than me capable of
-	implementing the ANSI C standard to spec????
-
-	* posix/glob.c [DIRENT]: #include <sys/types.h> before <dirent.h>
-	#ifdef USG.
-

glob/glob.c

@@ -26,6 +26,7 @@ Cambridge, MA 02139, USA.  */
 
 #include <errno.h>
 #include <sys/types.h>
+#include <sys/stat.h>
 
 
 /* Comment out all this code if we are using the GNU C Library, and are not
@@ -173,6 +174,19 @@ extern char *alloca ();
 
 #endif
 
+#ifndef __GNU_LIBRARY__
+#define __lstat lstat
+#ifndef HAVE_LSTAT
+#define lstat stat
+#endif
+#ifdef STAT_MACROS_BROKEN
+#undef S_ISDIR
+#endif
+#ifndef S_ISDIR
+#define S_ISDIR(mode) (((mode) & S_IFMT) == S_IFDIR)
+#endif
+#endif
+
 #ifndef	STDC_HEADERS
 #undef	size_t
 #define	size_t	unsigned int
@@ -394,9 +408,21 @@ glob (pattern, flags, errfunc, pglob)
 	}
     }
 
+  if (flags & GLOB_MARK)
+    {
+      /* Append slashes to directory names.  glob_in_dir has already
+	 allocated the extra character for us.  */
+      int i;
+      struct stat st;
+      for (i = oldcount; i < pglob->gl_pathc; ++i)
+	if (__lstat (pglob->gl_pathv[i], &st) == 0 &&
+	    S_ISDIR (st.st_mode))
+	  strcat (pglob->gl_pathv[i], "/");
+    }
+
   if (!(flags & GLOB_NOSORT))
     /* Sort the vector.  */
-    qsort ((__ptr_t) & pglob->gl_pathv[oldcount],
+    qsort ((__ptr_t) &pglob->gl_pathv[oldcount],
 	   pglob->gl_pathc - oldcount,
 	   sizeof (char *), collated_compare);
 
@@ -595,8 +621,6 @@ glob_in_dir (pattern, directory, flags, errfunc, pglob)
 		if (new->name == NULL)
 		  goto memory_error;
 		memcpy ((__ptr_t) new->name, name, len);
-		if (flags & GLOB_MARK)
-		  new->name[len++] = '/';
 		new->name[len] = '\0';
 		new->next = names;
 		names = new;
@@ -611,12 +635,10 @@ glob_in_dir (pattern, directory, flags, errfunc, pglob)
       nfound = 1;
       names = (struct globlink *) __alloca (sizeof (struct globlink));
       names->next = NULL;
-      names->name = (char *) malloc (len + ((flags & GLOB_MARK) ? 1 : 0) + 1);
+      names->name = (char *) malloc (len + 1);
       if (names->name == NULL)
 	goto memory_error;
       memcpy (names->name, pattern, len);
-      if (flags & GLOB_MARK)
-	names->name[len++] = '/';
       names->name[len] = '\0';
     }
 

job.c

@@ -945,23 +945,17 @@ new_job (file)
   c->environment = 0;
 
   /* Fetch the first command line to be run.  */
-  if (! job_next_command (c))
-    {
-      /* There were no commands!  */
-      free_child (c);
-      c->file->update_status = 0;
-    }
-  else
-    {
-      /* The job is now primed.  Start it running.  */
-      start_waiting_job (c);
+  job_next_command (c);
 
-      if (job_slots == 1)
-	/* Since there is only one job slot, make things run linearly.
-	   Wait for the child to die, setting the state to `cs_finished'.  */
-	while (file->command_state == cs_running)
-	  reap_children (1, 0);
-    }
+  /* The job is now primed.  Start it running.
+     (This will notice if there are in fact no commands.)  */
+  start_waiting_job (c);
+
+  if (job_slots == 1)
+    /* Since there is only one job slot, make things run linearly.
+       Wait for the child to die, setting the state to `cs_finished'.  */
+    while (file->command_state == cs_running)
+      reap_children (1, 0);
 }
 
 /* Move CHILD's pointers to the next command for it to execute.
@@ -971,7 +965,7 @@ static int
 job_next_command (child)
      struct child *child;
 {
-  if (child->command_ptr == 0 || *child->command_ptr == '\0')
+  while (child->command_ptr == 0 || *child->command_ptr == '\0')
     {
       /* There are no more lines in the expansion of this line.  */
       if (child->command_line == child->file->cmds->ncommand_lines)

remake.c

@@ -593,7 +593,9 @@ update_file_1 (file, depth)
 
 /* Set FILE's `updated' flag and re-check its mtime and the mtime's of all
    files listed in its `also_make' member.  Under -t, this function also
-   touches FILE.  */
+   touches FILE.
+
+   On return, FILE->update_status will no longer be -1 if it was.  */
 
 void
 notice_finished_file (file)
@@ -668,6 +670,10 @@ notice_finished_file (file)
 	     never be done because the target is already updated.  */
 	  (void) f_mtime (d->file, 0);
       }
+  else if (file->update_status == -1)
+    /* Nothing was done for FILE, but it needed nothing done.
+       So mark it now as "succeeded".  */
+    file->update_status = 0;
 }
 
 /* Check whether another file (whose mtime is THIS_MTIME)

signame.c

@@ -15,14 +15,22 @@ You should have received a copy of the GNU General Public License
 along with this program; see the file COPYING.  If not, write to
 the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <sys/types.h>		/* Some systems need this for <signal.h>.  */
 #include <signal.h>
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
+/* Some systems declare `sys_siglist in <unistd.h>; if
+   configure defined SYS_SIGLIST_DECLARED, it may expect
+   to find the declaration there.  */
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
 #endif
 
+
 /* Some systems do not define NSIG in <signal.h>.  */
 #ifndef	NSIG
 #ifdef	_NSIG

version.c

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