Skip to content

Commit

Permalink
Fix building of magit, transient and with-editor (#2965)
Browse files Browse the repository at this point in the history
* Fix building of `magit`, `transient` and `with-editor`

They now use `EMACS` instead of `EMACSBIN`

* Two more packages use `EMACS` instead of `EMACSBIN`
  • Loading branch information
alexott authored Dec 26, 2024
1 parent 847901f commit 6e374cc
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions recipes/forge.rcp
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
:compile "lisp/"
;; Use the Makefile to produce the info manual, el-get can
;; handle compilation and autoloads on its own.
:build `(("make" ,(format "EMACSBIN=%s" el-get-emacs) "info"))
:build/berkeley-unix `(("gmake" ,(format "EMACSBIN=%s" el-get-emacs)
:build `(("make" ,(format "EMACS=%s" el-get-emacs) "info"))
:build/berkeley-unix `(("gmake" ,(format "EMACS=%s" el-get-emacs)
"info")))
4 changes: 2 additions & 2 deletions recipes/ghub.rcp
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
:compile "lisp/"
;; Use the Makefile to produce the info manual, el-get can
;; handle compilation and autoloads on its own.
:build `(("make" ,(format "EMACSBIN=%s" el-get-emacs) "info"))
:build/berkeley-unix `(("gmake" ,(format "EMACSBIN=%s" el-get-emacs)
:build `(("make" ,(format "EMACS=%s" el-get-emacs) "info"))
:build/berkeley-unix `(("gmake" ,(format "EMACS=%s" el-get-emacs)
"info")))
4 changes: 2 additions & 2 deletions recipes/magit.rcp
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
;; handle compilation and autoloads on its own. Create an
;; empty autoloads file because magit.el explicitly checks for
;; a file of that name.
:build `(("make" ,(format "EMACSBIN=%s" el-get-emacs) "info")
:build `(("make" ,(format "EMACS=%s" el-get-emacs) "info")
("touch" "lisp/magit-autoloads.el"))
:build/berkeley-unix `(("gmake" ,(format "EMACSBIN=%s" el-get-emacs) "docs")
:build/berkeley-unix `(("gmake" ,(format "EMACS=%s" el-get-emacs) "docs")
("touch" "lisp/magit-autoloads.el"))
;; assume windows lacks make and makeinfo
:build/windows-nt (with-temp-file "lisp/magit-autoloads.el" nil))
4 changes: 2 additions & 2 deletions recipes/transient.rcp
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
:compile "lisp/"
;; Use the Makefile to produce the info manual, el-get can
;; handle compilation and autoloads on its own.
:build `(("make" ,(format "EMACSBIN=%s" el-get-emacs) "info"))
:build/berkeley-unix `(("gmake" ,(format "EMACSBIN=%s" el-get-emacs)
:build `(("make" ,(format "EMACS=%s" el-get-emacs) "info"))
:build/berkeley-unix `(("gmake" ,(format "EMACS=%s" el-get-emacs)
"info"))
;; Assume windows lacks a build environment.
:build/windows-nt (with-temp-file "lisp/transient-autoloads.el" nil))
4 changes: 2 additions & 2 deletions recipes/with-editor.rcp
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
:compile "lisp/"
;; Use the Makefile to produce the info manual, el-get can
;; handle compilation and autoloads on its own.
:build `(("make" ,(format "EMACSBIN=%s" el-get-emacs) "info"))
:build/berkeley-unix `(("gmake" ,(format "EMACSBIN=%s" el-get-emacs)
:build `(("make" ,(format "EMACS=%s" el-get-emacs) "info"))
:build/berkeley-unix `(("gmake" ,(format "EMACS=%s" el-get-emacs)
"info")))

0 comments on commit 6e374cc

Please sign in to comment.