[PATCH 1/2] lib/make.sh: Add support for installing headers for i686 and x86_64