Export correctly when diy is a subproject

Sujin Philiprequested to merge
sujin.philip/diy:fix-export into master

Merge request reports