{Reviewer: Matt} Fix annoying '/bin/sh: 3: @echo: not found' error message

Can you review? It looks as though someone used @ in front of "echo" to suppress Makefile printing the command, then added some if statements before that and never removed the original @.