Added variables for i686 and x86_64 packages