From 54c8722dcb48baed177091ea5e0ef00d9e05e52b Mon Sep 17 00:00:00 2001 From: Alex Ott Date: Thu, 26 Dec 2024 16:42:27 +0100 Subject: [PATCH 1/2] Fix building of `magit`, `transient` and `with-editor` They now use `EMACS` instead of `EMACSBIN` --- recipes/magit.rcp | 4 ++-- recipes/transient.rcp | 4 ++-- recipes/with-editor.rcp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/recipes/magit.rcp b/recipes/magit.rcp index 271e4974a..611ccf2c1 100644 --- a/recipes/magit.rcp +++ b/recipes/magit.rcp @@ -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)) diff --git a/recipes/transient.rcp b/recipes/transient.rcp index c1df040e4..9cf87735f 100644 --- a/recipes/transient.rcp +++ b/recipes/transient.rcp @@ -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)) diff --git a/recipes/with-editor.rcp b/recipes/with-editor.rcp index 8b8e86b90..a61670446 100644 --- a/recipes/with-editor.rcp +++ b/recipes/with-editor.rcp @@ -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"))) From 59a529c4b80ff82bd6959d9667b4c78e4d190fa0 Mon Sep 17 00:00:00 2001 From: Alex Ott Date: Thu, 26 Dec 2024 16:46:04 +0100 Subject: [PATCH 2/2] Two more packages use `EMACS` instead of `EMACSBIN` --- recipes/forge.rcp | 4 ++-- recipes/ghub.rcp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes/forge.rcp b/recipes/forge.rcp index 8f4f66dcd..21e0db67d 100644 --- a/recipes/forge.rcp +++ b/recipes/forge.rcp @@ -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"))) diff --git a/recipes/ghub.rcp b/recipes/ghub.rcp index f7a3088d0..4b2259cf8 100644 --- a/recipes/ghub.rcp +++ b/recipes/ghub.rcp @@ -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")))