diff options
author | Manoj Srivastava <srivasta@debian.org> | 2008-05-30 14:13:30 -0500 |
---|---|---|
committer | Manoj Srivastava <srivasta@debian.org> | 2008-05-30 14:13:30 -0500 |
commit | fcfe3f145944eb93270f8c4d301313364e1f30b2 (patch) | |
tree | 378d1e978b67c2c78904a81b454d303def969a97 /mcon/U/d_gethname.U | |
parent | e65bb46f249ce0cb16f71814f8b542eea87a8a82 (diff) | |
parent | 6ed168ff814db8f9bcaad6f2e218fb2bbacbdb1c (diff) |
Merge branch 'upstream' into topic--debian
Conflicts:
jmake/files/Jmake.rules
mcon/U/Chk_MANI.U
Signed-off-by: Manoj Srivastava <srivasta@debian.org>
Diffstat (limited to 'mcon/U/d_gethname.U')
-rw-r--r-- | mcon/U/d_gethname.U | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mcon/U/d_gethname.U b/mcon/U/d_gethname.U index 67b59f0..8ce181f 100644 --- a/mcon/U/d_gethname.U +++ b/mcon/U/d_gethname.U @@ -1,12 +1,12 @@ -?RCS: $Id: d_gethname.U,v 3.0.1.1 1994/10/29 16:13:00 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: d_gethname.U,v $ ?RCS: Revision 3.0.1.1 1994/10/29 16:13:00 ram @@ -16,7 +16,7 @@ ?RCS: Baseline for dist 3.0 netwide release. ?RCS: ?MAKE:d_gethname d_uname d_phostname aphostname: phostname cat \ - myhostname package d_portable Loc libc echo n c +i_whoami +usrinc \ + myhostname package d_portable Loc echo n c +i_whoami +usrinc \ Myread Guess Oldconfig Csym ?MAKE: -pick add $@ %< ?S:d_gethname: |