Few modifications to make  xpd build_docs work