Fix tar.gz filenames and final locations

The opt-based tgz build ends up in the wrong directory, the FHS-based
tgz has the wrong name and also ends up in the wrong directory.

This patch fixes these issues.