Use Automake directory variables in makefiles

Whoops, if we use the autoconf variables then they cannot be set at make
time.