Fix ARCH detection in build-selfexecutable and Makefile

arch=$(uname -m)
if [ "$arch" == 'x86_64' ]
then
   ARCHITECTURE=amd64
else
   ARCHITECTURE=i386
fi