Fixed Makefile.am for new paths