reverted changes to makefile.in and mk/clean