Merge pull request #1063 from jmaas/master

Minor changes to Makefile
Remove support for Itanium (ia64) architecture.