diff options
| author | Po Lu <luangruo@yahoo.com> | 2023-05-07 08:33:48 +0800 |
|---|---|---|
| committer | Po Lu <luangruo@yahoo.com> | 2023-05-07 08:33:48 +0800 |
| commit | c0a52c6cef77b8bc83e9d373ac0d0899c93f7a37 (patch) | |
| tree | 9b9787ad61e322e159f56e1a82518255ca4069d7 /Makefile.in | |
| parent | 11cb9cc598811ed36ba8aa2e5dafddeecaf95971 (diff) | |
| parent | d5ab8b6f2459b0c0111edc1ac7da20e1452c1f33 (diff) | |
| download | emacs-c0a52c6cef77b8bc83e9d373ac0d0899c93f7a37.tar.gz | |
Merge remote-tracking branch 'origin/master' into feature/android
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in index 488f4c4ef45..b47e88f6970 100644 --- a/Makefile.in +++ b/Makefile.in @@ -421,9 +421,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."; \ @@ -1309,7 +1309,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. |