svn commit: r241962 - stable/8/sys/conf

[John Baldwin]

On Tuesday, October 23, 2012 3:16:05 pm Andrey Chernov wrote:
> On 23.10.2012 23:04, John Baldwin wrote:
> >   Remove attempt to use an empty NORMAL_CTFCONVERT and always fall back to
> >   using a the null "@:" command if CTF is disabled.
> 
> Thanks for merging. BTW, you can merge make change into branch 8 too and use
> complex check like that
> 
> .elif (${MAKE_VERSION} >= 8<fix_merged> && ${MAKE_VERSION} < 9000000000) || ${MAKE_VERSION} >= 9201210220
> 
> to keep mk files similar everywhere.
> I don't know it worth efforts and don't check the make change compatible with 
> branch 8.

I considered it a bit risky to merge the make changes to 8 (make in 8 and 9
are not identical), so I went with the simpler fix.

-- 
John Baldwin