]> CyberLeo.Net >> Repos - FreeBSD/stable/9.git/commit
projects / FreeBSD / stable / 9.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 160d6be) | patch
MFC r249906:
authorbrooks <brooks@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Tue, 30 Apr 2013 20:15:53 +0000 (20:15 +0000)
committerbrooks <brooks@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Tue, 30 Apr 2013 20:15:53 +0000 (20:15 +0000)
commit1067ccf63bfc95275e56dcb558802e1d1e16b902
tree48f7046a18f193bbbd041fc2741a4501664f909dtree | snapshot
parent160d6be4067958b487c4ee8940f1c1f3eab259fbcommit | diff
MFC r249906:

Use the system MAKEOBJDIRPREFIX when running make targets in
mergemaster.  This allows bootstrap verions of tools to be used.

Add a note to UPDATING about this change.

This commit is a partial backout of r248531 in that it removes an
accidentally committed change to mergemaster.

Discussed with: jhb
Sponsored by: DARPA, AFRL

git-svn-id: svn://svn.freebsd.org/base/stable/9@250118 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
UPDATING diff | blob | history
usr.sbin/mergemaster/mergemaster.sh diff | blob | history
9-STABLE