Some quoting and style fixes to Makefile