===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/make/compat.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -c -r1.4 -r1.5
*** src/usr.bin/make/compat.c	1996/11/30 21:08:51	1.4
--- src/usr.bin/make/compat.c	1997/04/01 07:28:09	1.5
***************
*** 1,5 ****
! /*	$OpenBSD: compat.c,v 1.4 1996/11/30 21:08:51 millert Exp $	*/
! /*	$NetBSD: compat.c,v 1.14 1996/11/06 17:59:01 christos Exp $	*/
  
  /*
   * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
--- 1,5 ----
! /*	$OpenBSD: compat.c,v 1.5 1997/04/01 07:28:09 millert Exp $	*/
! /*	$NetBSD: compat.c,v 1.18 1997/03/28 22:31:22 christos Exp $	*/
  
  /*
   * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
***************
*** 43,49 ****
  #if 0
  static char sccsid[] = "@(#)compat.c	8.2 (Berkeley) 3/19/94";
  #else
! static char rcsid[] = "$OpenBSD: compat.c,v 1.4 1996/11/30 21:08:51 millert Exp $";
  #endif
  #endif /* not lint */
  
--- 43,49 ----
  #if 0
  static char sccsid[] = "@(#)compat.c	8.2 (Berkeley) 3/19/94";
  #else
! static char rcsid[] = "$OpenBSD: compat.c,v 1.5 1997/04/01 07:28:09 millert Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 366,374 ****
  {
      GNode *gn = (GNode *) gnp;
      GNode *pgn = (GNode *) pgnp;
!     if (gn->type & OP_USE) {
! 	Make_HandleUse(gn, pgn);
!     } else if (gn->made == UNMADE) {
  	/*
  	 * First mark ourselves to be made, then apply whatever transformations
  	 * the suffix module thinks are necessary. Once that's done, we can
--- 366,378 ----
  {
      GNode *gn = (GNode *) gnp;
      GNode *pgn = (GNode *) pgnp;
! 
!     if (pgn->type & OP_MADE) {
! 	(void) Dir_MTime(gn);
! 	gn->made = UPTODATE;
!     }
! 
!     if (gn->made == UNMADE) {
  	/*
  	 * First mark ourselves to be made, then apply whatever transformations
  	 * the suffix module thinks are necessary. Once that's done, we can
***************
*** 626,631 ****
--- 630,641 ----
              }
  	}
      }
+ 
+     /*
+      * Expand .USE nodes right now, because they can modify the structure
+      * of the tree.
+      */
+     Lst_Destroy(Make_ExpandUse(targs), NOFREE);
  
      /*
       * For each entry in the list of targets to create, call CompatMake on