Minor makefile update

More robustness involved now.  Some variable renaming too.