===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/make/job.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -c -r1.31 -r1.32
*** src/usr.bin/make/job.c	2000/06/23 16:18:09	1.31
--- src/usr.bin/make/job.c	2000/06/23 16:20:01	1.32
***************
*** 1,4 ****
! /*	$OpenBSD: job.c,v 1.31 2000/06/23 16:18:09 espie Exp $	*/
  /*	$NetBSD: job.c,v 1.16 1996/11/06 17:59:08 christos Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: job.c,v 1.32 2000/06/23 16:20:01 espie Exp $	*/
  /*	$NetBSD: job.c,v 1.16 1996/11/06 17:59:08 christos Exp $	*/
  
  /*
***************
*** 43,49 ****
  #if 0
  static char sccsid[] = "@(#)job.c	8.2 (Berkeley) 3/19/94";
  #else
! static char rcsid[] = "$OpenBSD: job.c,v 1.31 2000/06/23 16:18:09 espie Exp $";
  #endif
  #endif /* not lint */
  
--- 43,49 ----
  #if 0
  static char sccsid[] = "@(#)job.c	8.2 (Berkeley) 3/19/94";
  #else
! static char rcsid[] = "$OpenBSD: job.c,v 1.32 2000/06/23 16:20:01 espie Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 551,557 ****
       * the variables in the command.
       */
      cmdNode = Lst_Member(&job->node->commands, cmd);
!     cmdStart = cmd = Var_Subst(cmd, job->node, FALSE);
      Lst_Replace(cmdNode, cmdStart);
  
      cmdTemplate = "%s\n";
--- 551,557 ----
       * the variables in the command.
       */
      cmdNode = Lst_Member(&job->node->commands, cmd);
!     cmdStart = cmd = Var_Subst(cmd, &job->node->context, FALSE);
      Lst_Replace(cmdNode, cmdStart);
  
      cmdTemplate = "%s\n";
***************
*** 670,676 ****
  {
      char *result;
  
!     result = Var_Subst((char *)cmd, (GNode *)gn, FALSE);
      Lst_AtEnd(&postCommands->commands, result);
  }
  
--- 670,676 ----
  {
      char *result;
  
!     result = Var_Subst((char *)cmd, &((GNode *)gn)->context, FALSE);
      Lst_AtEnd(&postCommands->commands, result);
  }