yet another make update - more changes for proper install