[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master a5d142e8301 1/2: Fix portability problem in toplevel Makefile
From: |
Po Lu |
Subject: |
master a5d142e8301 1/2: Fix portability problem in toplevel Makefile |
Date: |
Sat, 6 May 2023 08:44:19 -0400 (EDT) |
branch: master
commit a5d142e8301c3dfb193e89eda9caf50ee2a92d28
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>
Fix portability problem in toplevel Makefile
* Makefile.in (sanity-check, preferred-branch-is-current): Avoid
POSIX command substitution, to make Makefile work with the SVR4
shell.
---
Makefile.in | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 0b7c9680fe5..729cd4140e5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -417,9 +417,9 @@ advice-on-failure:
sanity-check:
@[ -f .no-advice-on-failure ] && exit 0; true
- @v=$$(src/emacs${EXEEXT} --batch --eval \
+ @v=`src/emacs${EXEEXT} --batch --eval \
'(progn (defun f (n) (if (= 0 n) 1 (* n (f (- n 1))))) (princ (f
10)))' \
- 2> /dev/null); \
+ 2> /dev/null`; \
[ "X$$v" = "X3628800" ] && exit 0; \
echo >&2 '***'; \
echo >&2 '*** '"\"make ${make-target}\" succeeded, but Emacs is not
functional."; \
@@ -1287,7 +1287,7 @@ PREFERRED_BRANCH = emacs-28
preferred-branch-is-current:
git branch | grep -q '^\* $(PREFERRED_BRANCH)$$'
unchanged-history-files:
- x=$$(git diff-files --name-only $(CHANGELOG_N) $(emacslog)) && \
+ x=`git diff-files --name-only $(CHANGELOG_N) $(emacslog)` && \
test -z "$$x"
# Regular expression that matches the newest commit covered by a ChangeLog.