changed back setup.mk for pull requesting