===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/make/suff.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -c -r1.63 -r1.64
*** src/usr.bin/make/suff.c	2007/09/16 10:14:26	1.63
--- src/usr.bin/make/suff.c	2007/09/16 12:30:35	1.64
***************
*** 1,5 ****
  /*	$OpenPackages$ */
! /*	$OpenBSD: suff.c,v 1.63 2007/09/16 10:14:26 espie Exp $ */
  /*	$NetBSD: suff.c,v 1.13 1996/11/06 17:59:25 christos Exp $	*/
  
  /*
--- 1,5 ----
  /*	$OpenPackages$ */
! /*	$OpenBSD: suff.c,v 1.64 2007/09/16 12:30:35 espie Exp $ */
  /*	$NetBSD: suff.c,v 1.13 1996/11/06 17:59:25 christos Exp $	*/
  
  /*
***************
*** 756,762 ****
   *
   * Side Effects:
   *	The searchPath field of all the suffixes is extended by the
!  *	directories in dirSearchPath. If paths were specified for the
   *	".h" suffix, the directories are stuffed into a global variable
   *	called ".INCLUDES" with each directory preceded by a -I. The same
   *	is done for the ".a" suffix, except the variable is called
--- 756,762 ----
   *
   * Side Effects:
   *	The searchPath field of all the suffixes is extended by the
!  *	directories in defaultPath. If paths were specified for the
   *	".h" suffix, the directories are stuffed into a global variable
   *	called ".INCLUDES" with each directory preceded by a -I. The same
   *	is done for the ".a" suffix, except the variable is called
***************
*** 784,792 ****
  	    if (s->flags & SUFF_LIBRARY) {
  		Dir_Concat(&inLibs, &s->searchPath);
  	    }
! 	    Dir_Concat(&s->searchPath, dirSearchPath);
  	} else
! 	    Lst_Clone(&s->searchPath, dirSearchPath, Dir_CopyDir);
      }
  
      Var_Set(".INCLUDES", ptr = Dir_MakeFlags("-I", &inIncludes));
--- 784,792 ----
  	    if (s->flags & SUFF_LIBRARY) {
  		Dir_Concat(&inLibs, &s->searchPath);
  	    }
! 	    Dir_Concat(&s->searchPath, defaultPath);
  	} else
! 	    Lst_Clone(&s->searchPath, defaultPath, Dir_CopyDir);
      }
  
      Var_Set(".INCLUDES", ptr = Dir_MakeFlags("-I", &inIncludes));
***************
*** 1256,1262 ****
  	path = &s->searchPath;
      } else
  	/* Use default search path.  */
! 	path = dirSearchPath;
  
      /* Expand the word along the chosen path. */
      Lst_Init(&exp);
--- 1256,1262 ----
  	path = &s->searchPath;
      } else
  	/* Use default search path.  */
! 	path = defaultPath;
  
      /* Expand the word along the chosen path. */
      Lst_Init(&exp);
***************
*** 1679,1685 ****
  	    (Lst_IsEmpty(&gn->children) && Lst_IsEmpty(&gn->commands)))
  	{
  	    gn->path = Dir_FindFile(gn->name,
! 				    (targ == NULL ? dirSearchPath :
  				     &targ->suff->searchPath));
  	    if (gn->path != NULL) {
  		char *ptr;
--- 1679,1685 ----
  	    (Lst_IsEmpty(&gn->children) && Lst_IsEmpty(&gn->commands)))
  	{
  	    gn->path = Dir_FindFile(gn->name,
! 				    (targ == NULL ? defaultPath :
  				     &targ->suff->searchPath));
  	    if (gn->path != NULL) {
  		char *ptr;
***************
*** 1965,1971 ****
      suffNull->name =	    estrdup("");
      suffNull->nameLen =     0;
      Lst_Init(&suffNull->searchPath);
!     Dir_Concat(&suffNull->searchPath, dirSearchPath);
      Lst_Init(&suffNull->children);
      Lst_Init(&suffNull->parents);
      Lst_Init(&suffNull->ref);
--- 1965,1971 ----
      suffNull->name =	    estrdup("");
      suffNull->nameLen =     0;
      Lst_Init(&suffNull->searchPath);
!     Dir_Concat(&suffNull->searchPath, defaultPath);
      Lst_Init(&suffNull->children);
      Lst_Init(&suffNull->parents);
      Lst_Init(&suffNull->ref);