[m-rev.] for review: Ignore target-specific make variables when computing VPATH.

[Peter Wang]

On Mon, 16 Oct 2023 14:33:15 +1100 "Zoltan Somogyi" <zoltan.somogyi at runbox.com> wrote:
> 
> > +EXTRA_INT_DIRS_FOR_VPATH = $(foreach dir, $(EXTRA_INT_DIRS),\
> >  				$(shell @CYGPATHU@ "$(dir)"))
> >  
> > -UNIX_MERC_INT_DIR = $(shell @CYGPATHU@ "$(MERC_INT_DIR)")
> > -UNIX_MERCURY_EXTRA_INIT_DIRS = $(foreach dir, $(MERCURY_EXTRA_INIT_DIRS),\
> > +MERC_INT_DIR_FOR_VPATH = $(shell @CYGPATHU@ "$(MERC_INT_DIR)")
> > +EXTRA_INIT_DIRS_FOR_VPATH = $(foreach dir, $(EXTRA_INIT_DIRS_NO_TARGET),\
> >  				$(shell @CYGPATHU@ "$(dir)"))
> >  
> >  nullstring =
> >  MMAKE_VPATH	= $(subst $(nullstring) ,:,$(strip \
> > -			$(UNIX_MERCURY_EXTRA_INT_DIRS) $(UNIX_MERC_INT_DIR)\
> > -			$(UNIX_MERCURY_EXTRA_INIT_DIRS)))
> > +			$(EXTRA_INT_DIRS_FOR_VPATH) \
> > +			$(MERC_INT_DIR_FOR_VPATH)\
> > +			$(EXTRA_INIT_DIRS_FOR_VPATH)))
> >  VPATH		= $(MMAKE_VPATH) # do not remove the `:' from this comment!!!
> >  #			 the above comment works around a misfeature of
> >  #			 autoconf which causes it to delete assignments to
> > @@ -70,6 +79,8 @@ GPATH		= $(VPATH)
> >  DEFAULT_GRADE	= $(MERCURY_DEFAULT_GRADE)
> >  GRADE		= $(DEFAULT_GRADE)
> >  GRADESTRING	= $(shell $(MCOGS) $(ALL_GRADEFLAGS) $(ALL_MCFLAGS))
> > +GRADESTRING_NO_TARGET = $(shell $(MCOGS) $(ALL_GRADEFLAGS_NO_TARGET) \
> > +			  $(ALL_MCFLAGS_NO_TARGET))
> 
> I don't know whether my mail agent is screwing up indentation, but in cases like this,
> I like to line up the identical parts of definitions, so people can see more easily
> which parts of the right hand side are identical between the two variables
> and which aren't.
> 
> There are more instances of that below.
> 

I've lined them up and followed your other suggestions as well. Thanks.

Peter