===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/make/parsevar.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -c -r1.9 -r1.10
*** src/usr.bin/make/parsevar.c	2007/09/16 09:46:14	1.9
--- src/usr.bin/make/parsevar.c	2007/09/17 09:28:36	1.10
***************
*** 1,5 ****
  /*	$OpenPackages$ */
! /*	$OpenBSD: parsevar.c,v 1.9 2007/09/16 09:46:14 espie Exp $	*/
  /*	$NetBSD: parse.c,v 1.29 1997/03/10 21:20:04 christos Exp $	*/
  
  /*
--- 1,5 ----
  /*	$OpenPackages$ */
! /*	$OpenBSD: parsevar.c,v 1.10 2007/09/17 09:28:36 espie Exp $	*/
  /*	$NetBSD: parse.c,v 1.29 1997/03/10 21:20:04 christos Exp $	*/
  
  /*
***************
*** 104,115 ****
  		case '?':
  			if (type & (VAR_OPT|VAR_APPEND))
  				type = VAR_INVALID;
! 			else 
  				type |= VAR_OPT;
  			break;
  
  		case ':':
! 			if (FEATURES(FEATURE_SUNSHCMD) && 
  			    strncmp(arg, "sh", 2) == 0) {
  				type = VAR_SHELL;
  				arg += 2;
--- 104,115 ----
  		case '?':
  			if (type & (VAR_OPT|VAR_APPEND))
  				type = VAR_INVALID;
! 			else
  				type |= VAR_OPT;
  			break;
  
  		case ':':
! 			if (FEATURES(FEATURE_SUNSHCMD) &&
  			    strncmp(arg, "sh", 2) == 0) {
  				type = VAR_SHELL;
  				arg += 2;
***************
*** 169,179 ****
  		/*
  		 * Allow variables in the old value to be undefined, but leave
  		 * their invocation alone -- this is done by forcing
! 		 * errorIsOkay to be false.  
! 		 * XXX: This can cause recursive variables, but that's not 
  		 * hard to do, and this allows someone to do something like
  		 *
! 		 *  CFLAGS = $(.INCLUDES) 
  		 *  CFLAGS := -I.. $(CFLAGS)
  		 *
  		 * And not get an error.
--- 169,179 ----
  		/*
  		 * Allow variables in the old value to be undefined, but leave
  		 * their invocation alone -- this is done by forcing
! 		 * errorIsOkay to be false.
! 		 * XXX: This can cause recursive variables, but that's not
  		 * hard to do, and this allows someone to do something like
  		 *
! 		 *  CFLAGS = $(.INCLUDES)
  		 *  CFLAGS := -I.. $(CFLAGS)
  		 *
  		 * And not get an error.