From 3fee4e7fcb6a7eb2cbe03759a9965f8e8cfcb3d7 Mon Sep 17 00:00:00 2001
From: psmith <psmith>
Date: Sat, 1 Aug 2009 22:09:40 +0000
Subject: [PATCH] Changes from Ralf Wildenhues.

---
 .cvsignore    |  1 +
 ChangeLog     | 16 ++++++++++++++++
 configure.in  | 12 ++++++++----
 doc/make.texi |  7 ++++++-
 job.c         |  2 +-
 5 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index d8801b8..06685b3 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -7,6 +7,7 @@ stamp-*
 makebook*
 
 .*gdbinit
+.gdb_history
 
 *.dep *.dvi *.toc *.aux *.log
 *.cp *.cps *.fn *.fns *.vr *.vrs *.tp *.tps *.ky *.kys *.pg *.pgs
diff --git a/ChangeLog b/ChangeLog
index f505073..3f0b073 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2009-07-29  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+        * job.c (construct_command_argv_internal): Add "ulimit" and
+        "unset" to the sh_cmds for Unixy shells.
+
+2009-07-29  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+        * configure.in: Move side-effects outside AC_CACHE_VAL arguments
+        that set make_cv_sys_gnu_glob, so they are also correctly set
+        when the cache has been populated before.
+
 2009-07-04  Eli Zaretskii  <eliz@gnu.org>
 
 	* function.c (func_realpath) [!HAVE_REALPATH]: Require the file to
@@ -216,6 +227,11 @@
 	* function.c (func_shell): Don't close pipedes[1] if it is -1.
 	Fixes Savannah bug #20495.
 
+2009-02-28  Ralf Wildenhues  <address@hidden>
+
+        * doc/make.texi (Instead of Execution): Document interaction of
+        -t with phony targets.
+
 2009-02-23  Ramon Garcia  <ramon.garcia.f@gmail.com>
 
 	Introduce a new keyword "private" which applies to target-specific
diff --git a/configure.in b/configure.in
index 6d8e894..8a375d3 100644
--- a/configure.in
+++ b/configure.in
@@ -20,7 +20,7 @@
 AC_INIT([GNU make],[3.81.90],[bug-make@gnu.org])
 
 AC_PREREQ(2.59)
-AC_REVISION([[$Id: configure.in,v 1.150 2009/06/04 06:30:27 psmith Exp $]])
+AC_REVISION([[$Id: configure.in,v 1.151 2009/08/01 22:09:40 psmith Exp $]])
 
 # Autoconf setup
 AC_CONFIG_AUX_DIR(config)
@@ -347,7 +347,6 @@ rm -f s.conftest conftoast
 
 # Check the system to see if it provides GNU glob.  If not, use our
 # local version.
-
 AC_MSG_CHECKING(if system libc has GNU glob)
 AC_CACHE_VAL(make_cv_sys_gnu_glob, [
  AC_EGREP_CPP(gnu glob,[
@@ -364,9 +363,14 @@ AC_CACHE_VAL(make_cv_sys_gnu_glob, [
 #endif
  ], [AC_MSG_RESULT(yes)
 make_cv_sys_gnu_glob=yes], [AC_MSG_RESULT([no; using local copy])
-AC_SUBST(GLOBINC) GLOBINC='-I$(srcdir)/glob'
-AC_SUBST(GLOBLIB) GLOBLIB=glob/libglob.a
 make_cv_sys_gnu_glob=no])])
+if test "$make_cv_sys_gnu_glob" = no; then
+  GLOBINC='-I$(srcdir)/glob'
+  GLOBLIB=glob/libglob.a
+fi
+AC_SUBST(GLOBINC)
+AC_SUBST(GLOBLIB)
+
 # Tell automake about this, so it can build the right .c files.
 AM_CONDITIONAL(USE_LOCAL_GLOB, test "$make_cv_sys_gnu_glob" = no)
 
diff --git a/doc/make.texi b/doc/make.texi
index b0b0940..6a1b3f6 100644
--- a/doc/make.texi
+++ b/doc/make.texi
@@ -4,7 +4,7 @@
 
 @include version.texi
 @set EDITION 0.70
-@set RCSID $Id: make.texi,v 1.56 2009/06/13 23:10:53 psmith Exp $
+@set RCSID $Id: make.texi,v 1.57 2009/08/01 22:09:40 psmith Exp $
 
 @settitle GNU @code{make}
 @setchapternewpage odd
@@ -7793,6 +7793,11 @@ is run regardless of these options.  Other lines in the same rule are
 not run unless they too begin with @samp{+} or contain @samp{$(MAKE)} or
 @samp{$@{MAKE@}} (@xref{MAKE Variable, ,How the @code{MAKE} Variable Works}.)
 
+@cindex phony targets and recipe execution
+The @samp{-t} flag prevents phony targets (@pxref{Phony Targets}) from
+being updated, unless there are recipe lines beginning with @samp{+}
+or containing @samp{$(MAKE)} or @samp{$@{MAKE@}}.
+
 The @samp{-W} flag provides two features:
 
 @itemize @bullet
diff --git a/job.c b/job.c
index 3ed27bf..b52868f 100644
--- a/job.c
+++ b/job.c
@@ -2327,7 +2327,7 @@ construct_command_argv_internal (char *line, char **restp, char *shell,
                              "eval", "exec", "exit", "export", "for", "if",
                              "login", "logout", "read", "readonly", "set",
                              "shift", "switch", "test", "times", "trap",
-                             "umask", "wait", "while", 0 };
+                             "ulimit", "umask", "unset", "wait", "while", 0 };
 # ifdef HAVE_DOS_PATHS
   /* This is required if the MSYS/Cygwin ports (which do not define
      WINDOWS32) are compiled with HAVE_DOS_PATHS defined, which uses
-- 
2.11.4.GIT