Un-did Makefile changes which are not yet cross-platform aware