(update_goal_chain): Reset FILE to G->file after the double-colon loop so

it is never null for following code.

compatMakefile

@@ -24,7 +24,8 @@
 
 # Ultrix 2.2 make doesn't expand the value of VPATH.
 VPATH = @srcdir@
-srcdir = $(VPATH)
+# This must repeat the value, because configure will remove `VPATH = .'.
+srcdir = @srcdir@
 
 CC = @CC@
 
@@ -255,6 +256,8 @@ glob-clean glob-realclean:
 
 Makefile: config.status $(srcdir)/Makefile.in
 	$(SHELL) config.status
+glob/Makefile: config.status $(srcdir)/glob/Makefile.in
+	$(SHELL) config.status
 config.h: stamp-config ;
 stamp-config: config.status $(srcdir)/config.h.in
 	$(SHELL) config.status

read.c

@@ -434,7 +434,7 @@ read_makefile (filename, flags)
 		in_ignored_define = 1;
 	      else
 		{
-		  p2 = end_of_token (p2);
+		  p2 = next_token (p2 + 6);
 		  /* Let the variable name be the whole rest of the line,
 		     with trailing blanks stripped (comments have already been
 		     removed), so it could be a complex variable/function

remake.c

@@ -179,6 +179,9 @@ update_goal_chain (goals, makefiles)
 		break;
 	    }
 
+	  /* Reset FILE since it is null at the end of the loop.  */
+	  file = g->file;
+
 	  if (stop || !any_not_updated)
 	    {
 	      /* If we have found nothing whatever to do for the goal,