Re: mergemaster broken

Me again.

Sat, Sep 27, 2008 at 02:45:12PM +0400, Eygene Ryabinkin wrote:
> This is not very clean, so I had created a quick patch for mergemaster
> (from -STABLE, have no -CURRENT at hand just now, sorry).  It enables
> all 'make' invocations to search /usr/src/share/mk prior to look for
> includes in /usr/share/mk.  Works for my quick testing, but there can be
> some rough points I had not noticed.  Please, try it.

Just verified the patch on -CURRENT -- works for me and cures your
problem, if I am using bsd.own.mk rev 1.77 during the run of the
mergemaster.
-- 
Eygene
 _                ___       _.--.   #
 \`.|\..----...-'`   `-._.-'_.-'`   #  Remember that it is hard
 /  ' `         ,       __.--'      #  to read the on-line manual   
 )/' _/     \   `-_,   /            #  while single-stepping the kernel.
 `-'" `"\_  ,_.-;_.-\_ ',  fsc/as   #
     _.-'_./   {_.'   ; /           #    -- FreeBSD Developers handbook 
    {_.-``-'         {_/            #