diff options
| author | Po Lu | 2023-05-06 20:42:22 +0800 |
|---|---|---|
| committer | Po Lu | 2023-05-06 20:42:22 +0800 |
| commit | a5d142e8301c3dfb193e89eda9caf50ee2a92d28 (patch) | |
| tree | 3f06325308e6a4c940cdd1e40a813fa586ef857f | |
| parent | 9b66a64d9c2c7ae2b155bf209ad735383070822e (diff) | |
| download | emacs-a5d142e8301c3dfb193e89eda9caf50ee2a92d28.tar.gz emacs-a5d142e8301c3dfb193e89eda9caf50ee2a92d28.zip | |
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.
| -rw-r--r-- | Makefile.in | 6 |
1 files 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: | |||
| 417 | 417 | ||
| 418 | sanity-check: | 418 | sanity-check: |
| 419 | @[ -f .no-advice-on-failure ] && exit 0; true | 419 | @[ -f .no-advice-on-failure ] && exit 0; true |
| 420 | @v=$$(src/emacs${EXEEXT} --batch --eval \ | 420 | @v=`src/emacs${EXEEXT} --batch --eval \ |
| 421 | '(progn (defun f (n) (if (= 0 n) 1 (* n (f (- n 1))))) (princ (f 10)))' \ | 421 | '(progn (defun f (n) (if (= 0 n) 1 (* n (f (- n 1))))) (princ (f 10)))' \ |
| 422 | 2> /dev/null); \ | 422 | 2> /dev/null`; \ |
| 423 | [ "X$$v" = "X3628800" ] && exit 0; \ | 423 | [ "X$$v" = "X3628800" ] && exit 0; \ |
| 424 | echo >&2 '***'; \ | 424 | echo >&2 '***'; \ |
| 425 | echo >&2 '*** '"\"make ${make-target}\" succeeded, but Emacs is not functional."; \ | 425 | echo >&2 '*** '"\"make ${make-target}\" succeeded, but Emacs is not functional."; \ |
| @@ -1287,7 +1287,7 @@ PREFERRED_BRANCH = emacs-28 | |||
| 1287 | preferred-branch-is-current: | 1287 | preferred-branch-is-current: |
| 1288 | git branch | grep -q '^\* $(PREFERRED_BRANCH)$$' | 1288 | git branch | grep -q '^\* $(PREFERRED_BRANCH)$$' |
| 1289 | unchanged-history-files: | 1289 | unchanged-history-files: |
| 1290 | x=$$(git diff-files --name-only $(CHANGELOG_N) $(emacslog)) && \ | 1290 | x=`git diff-files --name-only $(CHANGELOG_N) $(emacslog)` && \ |
| 1291 | test -z "$$x" | 1291 | test -z "$$x" |
| 1292 | 1292 | ||
| 1293 | # Regular expression that matches the newest commit covered by a ChangeLog. | 1293 | # Regular expression that matches the newest commit covered by a ChangeLog. |