Makefile.am: fix a typo and remove some redundant variables