Makefile now fits both Dor AND Sagi.