[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/ess b7ec1ec50d 1/2: sed/makeinfo changes needed for mac
From: |
ELPA Syncer |
Subject: |
[elpa] externals/ess b7ec1ec50d 1/2: sed/makeinfo changes needed for macOS |
Date: |
Fri, 26 Apr 2024 12:58:15 -0400 (EDT) |
branch: externals/ess
commit b7ec1ec50d23a35e75be2f111be5906597ca0282
Author: rodney sparapani <rsparapa@mcw.edu>
Commit: rodney sparapani <rsparapa@mcw.edu>
sed/makeinfo changes needed for macOS
---
Makeconf | 19 +++++++++----------
Makefile | 4 +++-
2 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/Makeconf b/Makeconf
index 16a4da5978..3d2b08a6ab 100644
--- a/Makeconf
+++ b/Makeconf
@@ -27,22 +27,21 @@ EMACSBATCH ?= $(EMACS) -batch -Q
# ESSDESTDIR = $(SITELISP)/ess
# EMACSBATCH = $(EMACS) -batch -Q
-##__ GNU Emacs __ for macOS
+##__ GNU Emacs __ for macOS (and see Homebrew below)
# PREFIX=/Applications/Emacs.app/Contents/Resources
# EMACS=/Applications/Emacs.app/Contents/MacOS/Emacs
+# ## standard site-lisp
# SITELISP=$(PREFIX)/site-lisp
# LISPDIR=$(SITELISP)/ess
+# ## Vincent Goulet's Modified Emacs needs the following 2 settings
+# ## SITELISP=$(PREFIX)/lisp
+# ## LISPDIR=$(SITELISP)/ess/lisp
+# ESSDESTDIR=$(LISPDIR)
# INFODIR=/usr/local/info
# ETCDIR =$(PREFIX)/etc/ess
-
-##__ Vincent Goulet's Modified Emacs __ for macOS
-## site-lisp is empty: payload is in lisp directory
-# PREFIX=/Applications/Emacs.app/Contents/Resources
-# EMACS=/Applications/Emacs.app/Contents/MacOS/Emacs
-# SITELISP=$(PREFIX)/lisp
-# LISPDIR=$(SITELISP)/ess
-# INFODIR=/usr/local/info
-# ETCDIR =$(PREFIX)/etc/ess
+# EMACSBATCH=$(EMACS) -batch -Q
+# ## MacTeX does not provide makeinfo
+# MAKEINFO=touch ess.info && true
##__ GNU Emacs with Homebrew __ for macOS
## site-lisp is not within .app directory
diff --git a/Makefile b/Makefile
index c851f3ba6b..684cae2de4 100644
--- a/Makefile
+++ b/Makefile
@@ -22,8 +22,10 @@ version: VERSION
@echo $(shell $(EMACS) --version | sed -n 1p)
@echo ESS $(ESSVERSION)
@echo ESSR $(ESSR-VERSION)
- @sed -i "s/\"VERSION\"/\"$(ESSVERSION)\"/" lisp/ess-custom.el
+ @sed -i .orig "s/\"VERSION\"/\"$(ESSVERSION)\"/" lisp/ess-custom.el
@echo "*********************************************************"
+## FreeBSD sed -i requires a file extension
+## GNU sed -i does not require, but allows one
.PHONY: lisp
lisp: version