Revert Makefile.in changes to work with rpmbuild