Fix regression that affected directory names in 'build-root'
Also, keep the configure field in Package from expanding too early