Another change to the new doc build setup.

This time all contingencies tested!