svn commit: r186678 - head/usr.sbin/mergemaster

[Doug Barton]

Sam Leffler wrote:
> Doug Barton wrote:
>>   1. Switch to using the top level (e.g., /usr/src) Makefile, and specify
>>   that we should use the *.mk files from the source directory instead of
>>   the installed versions. [1][2] This allows easier cross builds and
>>   simplifies (or in some cases permits) upgrading.
>>   
> 
> I believe you changed the meaning of the -m flag so it now requires a
> pathname to the src tree and not src/etc.  This breaks existing usage. 
> In the PR I filed there was a follow-on patch from Bjoern that amended
> my suggestion to instead add a -M option to set the source tree.  I
> thought that was an improvement over my hack.  In lieu of that you might
> want to examine the pathname supplied to -m to try to provide backwards
> compatibility by stripping any /etc suffix on the path.

The version in bin/96528 from ru had a better fix for this issue, but
thanks for thinking of it. :)

Doug

-- 

    This .signature sanitized for your protection