=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/make/parse.c,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- src/usr.bin/make/parse.c 2001/05/03 13:41:08 1.59 +++ src/usr.bin/make/parse.c 2001/05/15 12:52:15 1.60 @@ -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 @@ 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 @@ break; default: - if (FEATURES(FEATURE_SUNSHCMD) && strncmp(end, ":sh", 3) == 0) - type = VAR_SHELL; - else - type = VAR_NORMAL; + type = VAR_NORMAL; break; }