Refix Makefile

according to the discussion with jmarshall