Fix buildinfo generation dependencies
Merge pull request #127 from Juniper/bugs

Fix buildinfo generation dependencies after code re-reorg