diff --git a/lisp/doom.el b/lisp/doom.el index ef15c03dc..948332387 100644 --- a/lisp/doom.el +++ b/lisp/doom.el @@ -272,12 +272,6 @@ where the module's group and name was deduced from the first and second level of directories. For example: if $DOOMDIR/modules/ is an entry, a $DOOMDIR/modules/lang/ruby/ directory represents a ':lang ruby' module.") -(defvar doom-bin-dir (expand-file-name "bin/" doom-emacs-dir) - "Where Doom's executables are stored. - -Defaults to $EMACSDIR/bin, where $EMACSDIR is `doom-emacs-dir'. Must end in a -slash.") - ;; DEPRECATED: .local will be removed entirely in 3.0 (defvar doom-local-dir (if-let* ((localdir (getenv-internal "DOOMLOCALDIR"))) diff --git a/lisp/lib/config.el b/lisp/lib/config.el index 9771e8225..97a585a12 100644 --- a/lisp/lib/config.el +++ b/lisp/lib/config.el @@ -28,9 +28,10 @@ (defmacro doom--if-compile (command on-success &optional on-failure) (declare (indent 2)) - `(let ((doom-bin "doom") - (default-directory doom-emacs-dir) - (exec-path (cons doom-bin-dir exec-path))) + `(let* ((doom-bin "doom") + (doom-bin-dir (expand-file-name "bin/" doom-emacs-dir)) + (default-directory doom-emacs-dir) + (exec-path (cons doom-bin-dir exec-path))) (when (and (featurep :system 'windows) (string-match-p "cmdproxy.exe$" shell-file-name)) (unless (executable-find "pwsh")