summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>2001-05-15 12:52:16 +0000
committerMarc Espie <espie@cvs.openbsd.org>2001-05-15 12:52:16 +0000
commit5c75c8dd57119b005a9752939ac1b404692b470f (patch)
tree1605c3fc93fcaef53abf5584bfc1c9baadeb95f9 /usr.bin
parenteb59fe35ba3031aa152df24a174a1666f8f45a64 (diff)
thinko in my rewrite. Repair var:sh = something
Looks like nobody is using this anyways.
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/make/parse.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/usr.bin/make/parse.c b/usr.bin/make/parse.c
index b2d813a267d..1f7e0b548ee 100644
--- a/usr.bin/make/parse.c
+++ b/usr.bin/make/parse.c
@@ -1,5 +1,5 @@
/* $OpenPackages$ */
-/* $OpenBSD: parse.c,v 1.59 2001/05/03 13:41:08 espie Exp $ */
+/* $OpenBSD: parse.c,v 1.60 2001/05/15 12:52:15 espie Exp $ */
/* $NetBSD: parse.c,v 1.29 1997/03/10 21:20:04 christos Exp $ */
/*
@@ -131,7 +131,7 @@
static char sccsid[] = "@(#)parse.c 8.3 (Berkeley) 3/19/94";
#else
UNUSED
-static char rcsid[] = "$OpenBSD: parse.c,v 1.59 2001/05/03 13:41:08 espie Exp $";
+static char rcsid[] = "$OpenBSD: parse.c,v 1.60 2001/05/15 12:52:15 espie Exp $";
#endif
#endif /* not lint */
@@ -1284,7 +1284,10 @@ Parse_DoVar(line, ctxt)
break;
case ':':
- type = VAR_SUBST;
+ if (FEATURES(FEATURE_SUNSHCMD) && strncmp(end, ":sh", 3) == 0)
+ type = VAR_SHELL;
+ else
+ type = VAR_SUBST;
break;
case '!':
@@ -1292,10 +1295,7 @@ Parse_DoVar(line, ctxt)
break;
default:
- if (FEATURES(FEATURE_SUNSHCMD) && strncmp(end, ":sh", 3) == 0)
- type = VAR_SHELL;
- else
- type = VAR_NORMAL;
+ type = VAR_NORMAL;
break;
}