Merge branch 'upstream'

Signed-off-by: Manoj Srivastava <srivasta@golden-gryphon.com>

Conflicts:
	jmake/jmake.man

1 files changed, 34 insertions, 7 deletions

diff --git a/jmake/jmake.man b/jmake/jmake.man
index a9cf077..49c4b73 100644
--- a/jmake/jmake.man
+++ b/jmake/jmake.man
@@ -1,7 +1,7 @@
-.\" $Id: jmake.man 3 2006-08-25 21:39:07Z rmanfredi $
+.\" $Id: jmake.man 47 2010-11-28 22:23:13Z rmanfredi $
 .\"
 .\"  Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi
-.\"  
+.\"
 .\"  You may redistribute only under the terms of the Artistic Licence,
 .\"  as specified in the README file that comes with the distribution.
 .\"  You may reuse parts of this distribution only within the terms of
@@ -152,6 +152,33 @@ To implement a logical OR, see below.
 .RE
 .sp
 .IP 3)
+Makefile target tests:
+.sp
+.RS
+.IP \(bu
+?\fItarget\fR?:<text>: keeps <test> iff \fItarget\fR is defined.
+.IP \(bu
+%\fItarget\fR%:<text>: keeps <test> iff \fItarget\fR is not defined.
+.sp
+A makefile \fItarget\fR is defined as a standalone target, for instance
+the
+.B depend.local
+target, which would be defined as:
+.sp
+.in +5
+.nf
+depend.local:
+.sp
+.in -5
+.fi
+Also note that it is only valid for targets defined
+.I so far
+in the generated makefile.  It is not a predicate that can be used
+to test for targets that will eventually be defined later on in the
+generation.
+.RE
+.sp
+.IP 4)
 Commands:
 .sp
 .RS
@@ -217,9 +244,9 @@ Here is a way to implement a logical OR:
 .in -5
 .sp
 Actually, this is ugly, because the text has to appear twice.
-Fortunately, I did not use it. :-)
+Fortunately, I did not use that construct. :-)
 .sp
-But actually, as you have surely already guessed, the best way to
+Indeed, as you have surely already guessed, the best way to
 implement a logical OR is to use De Morgan's Law:
 .sp
 .in +5
@@ -233,7 +260,7 @@ text					/* If SYMBOL or not TOKEN */
 .sp
 .in -5
 .fi
-Who said they didn't care ? ;-)
+Who said they didn't care about logic? ;-)
 .sp
 .PP
 Expansion is done with the \fIexpand\fR command.  It has been provided to
@@ -440,7 +467,7 @@ therefore depend on the configuration options chosen when \fIConfigure\fR
 was run.
 .RE
 .sp
-.IP 4)
+.IP 5)
 Initializations:
 .sp
 .RS
@@ -450,7 +477,7 @@ Initializations:
 ++SYMBOL <value>: Adds <value> to the SYMBOL macro.
 .RE
 .sp
-.IP 5)
+.IP 6)
 User-defined variables:
 .sp
 The user may define CFLAGS, LDFLAGS or DPFLAGS as additional flags to be used