Merge branch 'upstream'

Conflicts:

	jmake/files/Jmake.rules
	mcon/U/Chk_MANI.U

Signed-off-by: Manoj Srivastava <srivasta@debian.org>

1 files changed, 10 insertions, 5 deletions

diff --git a/mcon/U/package.U b/mcon/U/package.U
index f92e15f..32a4398 100644
--- a/mcon/U/package.U
+++ b/mcon/U/package.U
@@ -1,12 +1,12 @@
-?RCS: $Id: package.U,v 3.0.1.3 1994/10/29 16:27:21 ram Exp $
+?RCS: $Id$
 ?RCS:
-?RCS: Copyright (c) 1991-1993, Raphael Manfredi
+?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi
 ?RCS: 
 ?RCS: You may redistribute only under the terms of the Artistic Licence,
 ?RCS: as specified in the README file that comes with the distribution.
 ?RCS: You may reuse parts of this distribution only within the terms of
 ?RCS: that same Artistic Licence; a copy of which may be found at the root
-?RCS: of the source tree for dist 3.0.
+?RCS: of the source tree for dist 4.0.
 ?RCS:
 ?RCS: $Log: package.U,v $
 ?RCS: Revision 3.0.1.3  1994/10/29  16:27:21  ram
@@ -21,7 +21,7 @@
 ?RCS: Revision 3.0  1993/08/18  12:09:28  ram
 ?RCS: Baseline for dist 3.0 netwide release.
 ?RCS:
-?MAKE:package spackage: Null
+?MAKE:package spackage: Nothing
 ?MAKE:	-pick wipe $@ %<
 ?S:package:
 ?S:	This variable contains the name of the package being constructed.
@@ -32,9 +32,14 @@
 ?S:	with the first letter uppercased, i.e. suitable for starting
 ?S:	sentences.
 ?S:.
+?C:PACKAGE:
+?C:	This variable contains the name of the package being built.
+?C:.
+?H:#define PACKAGE "$package"
+?H:.
 ?T:first last
 : set package name
-package=<PACKAGENAME>
+package='<PACKAGENAME>'
 @if spackage
 first=`echo $package | sed -e 's/^\(.\).*/\1/'`
 last=`echo $package | sed -e 's/^.\(.*\)/\1/'`