Fixed 64 bit Linux detection.
Replaced the tags to keep the Makefile consistent