[VPATH PATCH 0/2] Fix Makefile.am when using VPATH