===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/make/var.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -c -r1.6 -r1.7
*** src/usr.bin/make/var.c	1997/04/01 07:28:28	1.6
--- src/usr.bin/make/var.c	1997/12/18 21:50:45	1.7
***************
*** 1,4 ****
! /*	$OpenBSD: var.c,v 1.6 1997/04/01 07:28:28 millert Exp $	*/
  /*	$NetBSD: var.c,v 1.18 1997/03/18 19:24:46 christos Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: var.c,v 1.7 1997/12/18 21:50:45 deraadt Exp $	*/
  /*	$NetBSD: var.c,v 1.18 1997/03/18 19:24:46 christos Exp $	*/
  
  /*
***************
*** 43,49 ****
  #if 0
  static char sccsid[] = "@(#)var.c	8.3 (Berkeley) 3/19/94";
  #else
! static char rcsid[] = "$OpenBSD: var.c,v 1.6 1997/04/01 07:28:28 millert Exp $";
  #endif
  #endif /* not lint */
  
--- 43,49 ----
  #if 0
  static char sccsid[] = "@(#)var.c	8.3 (Berkeley) 3/19/94";
  #else
! static char rcsid[] = "$OpenBSD: var.c,v 1.7 1997/12/18 21:50:45 deraadt Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 839,854 ****
      char *ptr;
      VarPattern 	  *pat = (VarPattern *) patp;
  
!     if (addSpace)
! 	Buf_AddByte(buf, (Byte)' ');
  
!     addSpace = TRUE;
  
!     if ((ptr = Str_SYSVMatch(word, pat->lhs, &len)) != NULL)
! 	Str_SYSVSubst(buf, pat->rhs, ptr, len);
!     else
! 	Buf_AddBytes(buf, strlen(word), (Byte *) word);
! 
      return(addSpace);
  }
  #endif
--- 839,855 ----
      char *ptr;
      VarPattern 	  *pat = (VarPattern *) patp;
  
!     if (*word) {
! 	    if (addSpace)
! 		Buf_AddByte(buf, (Byte)' ');
  
! 	    addSpace = TRUE;
  
! 	    if ((ptr = Str_SYSVMatch(word, pat->lhs, &len)) != NULL)
! 		Str_SYSVSubst(buf, pat->rhs, ptr, len);
! 	    else
! 		Buf_AddBytes(buf, strlen(word), (Byte *) word);
!     }
      return(addSpace);
  }
  #endif