fixes packaging (problem introduced by my recent commit and found by phessler@) but also fixes long-standing missing 64 from suffix on !i386/amd64