summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Smith <psmith@gnu.org>2009-08-01 22:09:40 +0000
committerPaul Smith <psmith@gnu.org>2009-08-01 22:09:40 +0000
commite2f16fdf45ec0506c68f32e9fc6a7b31ae17fdc6 (patch)
tree65af39bacf361af1a13c0a44780a9927175886a2
parent139c28ae6966b84e4c30898829a2202c6f3e0a3e (diff)
downloadgunmake-e2f16fdf45ec0506c68f32e9fc6a7b31ae17fdc6.tar.gz
Changes from Ralf Wildenhues.
-rw-r--r--.cvsignore1
-rw-r--r--ChangeLog16
-rw-r--r--configure.in10
-rw-r--r--doc/make.texi5
-rw-r--r--job.c2
5 files changed, 30 insertions, 4 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 db19f91..2a0dffe 100644
--- a/configure.in
+++ b/configure.in
@@ -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 9ca410b..c036a6d 100644
--- a/doc/make.texi
+++ b/doc/make.texi
@@ -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