Correct Makefile for vpath builds

Building out-of-tree/in a subdirectory needs some fixes to make sure the
proper references to the VPATH or srcdir directories are used.