===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/make/parse.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -c -r1.30 -r1.31
*** src/usr.bin/make/parse.c	1999/12/16 17:07:21	1.30
--- src/usr.bin/make/parse.c	1999/12/16 17:27:18	1.31
***************
*** 1,4 ****
! /*	$OpenBSD: parse.c,v 1.30 1999/12/16 17:07:21 espie Exp $	*/
  /*	$NetBSD: parse.c,v 1.29 1997/03/10 21:20:04 christos Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: parse.c,v 1.31 1999/12/16 17:27:18 espie Exp $	*/
  /*	$NetBSD: parse.c,v 1.29 1997/03/10 21:20:04 christos Exp $	*/
  
  /*
***************
*** 43,49 ****
  #if 0
  static char sccsid[] = "@(#)parse.c	8.3 (Berkeley) 3/19/94";
  #else
! static char rcsid[] = "$OpenBSD: parse.c,v 1.30 1999/12/16 17:07:21 espie Exp $";
  #endif
  #endif /* not lint */
  
--- 43,49 ----
  #if 0
  static char sccsid[] = "@(#)parse.c	8.3 (Berkeley) 3/19/94";
  #else
! static char rcsid[] = "$OpenBSD: parse.c,v 1.31 1999/12/16 17:27:18 espie Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 1535,1541 ****
  	Boolean	  oldOldVars = oldVars;
  
  	oldVars = FALSE;
! 	cp = Var_Subst(NULL, cp, ctxt, FALSE);
  	oldVars = oldOldVars;
  
  	Var_Set(line, cp, ctxt);
--- 1535,1541 ----
  	Boolean	  oldOldVars = oldVars;
  
  	oldVars = FALSE;
! 	cp = Var_Subst(cp, ctxt, FALSE);
  	oldVars = oldOldVars;
  
  	Var_Set(line, cp, ctxt);
***************
*** 1551,1557 ****
  	     * expansion on the whole thing. The resulting string will need
  	     * freeing when we're done, so set freeCmd to TRUE.
  	     */
! 	    cp = Var_Subst(NULL, cp, VAR_CMD, TRUE);
  	    freeCmd = TRUE;
  	}
  
--- 1551,1557 ----
  	     * expansion on the whole thing. The resulting string will need
  	     * freeing when we're done, so set freeCmd to TRUE.
  	     */
! 	    cp = Var_Subst(cp, VAR_CMD, TRUE);
  	    freeCmd = TRUE;
  	}
  
***************
*** 1715,1721 ****
       * Substitute for any variables in the file name before trying to
       * find the thing.
       */
!     file = Var_Subst (NULL, file, VAR_CMD, FALSE);
  
      /*
       * Now we know the file's name and its search path, we attempt to
--- 1715,1721 ----
       * Substitute for any variables in the file name before trying to
       * find the thing.
       */
!     file = Var_Subst(file, VAR_CMD, FALSE);
  
      /*
       * Now we know the file's name and its search path, we attempt to
***************
*** 1915,1921 ****
       * Substitute for any variables in the file name before trying to
       * find the thing.
       */
!     file = Var_Subst (NULL, file, VAR_CMD, FALSE);
  
      /*
       * Now we know the file's name, we attempt to find the durn thing.
--- 1915,1921 ----
       * Substitute for any variables in the file name before trying to
       * find the thing.
       */
!     file = Var_Subst(file, VAR_CMD, FALSE);
  
      /*
       * Now we know the file's name, we attempt to find the durn thing.
***************
*** 2586,2592 ****
  #endif
  		    ParseFinishLine();
  
! 		    cp = Var_Subst (NULL, line, VAR_CMD, TRUE);
  		    free (line);
  		    line = cp;
  
--- 2586,2592 ----
  #endif
  		    ParseFinishLine();
  
! 		    cp = Var_Subst(line, VAR_CMD, TRUE);
  		    free (line);
  		    line = cp;