modified make setup