Revert "Revert "Use tarball_basedir for tarball name""

This reverts commit 97309675ac8d24518adbb80224dc8fb13ef8166c.