[src/trunk]: src/usr.bin/make We cannot override commands yet, ignore the add...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/189699526414
branches:  trunk
changeset: 502237:189699526414
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Jan 14 05:41:08 2001 +0000

description:
We cannot override commands yet, ignore the additional sets for now.
This will be reverted when the tree is fixed.

diffstat:

 usr.bin/make/parse.c |  14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diffs (46 lines):

diff -r e59488de8e00 -r 189699526414 usr.bin/make/parse.c
--- a/usr.bin/make/parse.c      Sun Jan 14 05:34:06 2001 +0000
+++ b/usr.bin/make/parse.c      Sun Jan 14 05:41:08 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: parse.c,v 1.59 2001/01/14 05:34:06 christos Exp $      */
+/*     $NetBSD: parse.c,v 1.60 2001/01/14 05:41:08 christos Exp $      */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -39,14 +39,14 @@
  */
 
 #ifdef MAKE_BOOTSTRAP
-static char rcsid[] = "$NetBSD: parse.c,v 1.59 2001/01/14 05:34:06 christos Exp $";
+static char rcsid[] = "$NetBSD: parse.c,v 1.60 2001/01/14 05:41:08 christos Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)parse.c    8.3 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: parse.c,v 1.59 2001/01/14 05:34:06 christos Exp $");
+__RCSID("$NetBSD: parse.c,v 1.60 2001/01/14 05:41:08 christos Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -1599,11 +1599,19 @@
        (void)Lst_AtEnd(gn->commands, cmd);
        ParseMark(gn);
     } else {
+#ifdef notyet
+       /* XXX: We cannot do this until we fix the tree */
        (void)Lst_AtEnd(gn->commands, cmd);
        Parse_Error (PARSE_WARNING,
                     "overriding commands for target \"%s\" ignored; "
                     "previous commands defined at %s: %d",
                     gn->name, gn->fname, gn->lineno);
+#else
+       Parse_Error (PARSE_WARNING,
+                    "ignoring commands for target \"%s\" ignored; "
+                    "previous commands defined at %s: %d",
+                    gn->name, gn->fname, gn->lineno);
+#endif
     }
     return(0);
 }