Run make after dotfiles and emacs-d
Fix variables

This also makes the env.sh include dynamic.