Merge pull request #938 from JoesCat/master

Move "Output Makefile"s into configure.ac