Update $(lisp) and $(shortlisp) to match changes in loadup.el