PATCH: prevent mergemaster from doing a "make builldworld"

[Aryeh M. Friedman]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Patch attached.

- From the new man page:

BUGS
     If run without the -M flag on the "current" source tree as defined in
     development(7) make(1) will be called, even if invocation of
     mergemaster(8) follows immediate after a call to "make buildworld" or
     "make installworld".


The reason for not using a non-flagged workaround is it is not
possible to determine which SOURCEDIR your working in if they are
symlinked back to /FreeBSD/xxx.

- --
Aryeh M. Friedman
Developer, not business, friendly
http://www.flosoft-systems.com
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.4 (FreeBSD)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFHRPWQJ9+1V27SttsRAruBAJ0Qwf4kiycurQfPe3OUKbhS3ClT5gCfSOo2
wD3V2B1z6zIIZ0Wshmq5GkU=
=iTtQ
-----END PGP SIGNATURE-----

-------------- next part --------------
A non-text attachment was scrubbed...
Name: mergemaster.diff
Type: text/x-patch
Size: 3697 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/freebsd-current/attachments/20071122/50ae6b8d/mergemaster.bin