Fixed issue with with wrong Makefile.am files being copied