Fix OS portability problems for Makefile.
Progress.