Tweaks to Makefile.installall. Some dependency problems remain