diff options
| author | Glenn Morris | 2020-12-25 10:36:48 -0800 |
|---|---|---|
| committer | Glenn Morris | 2020-12-25 10:36:48 -0800 |
| commit | 90ec81f5b243b6b7b3ebe2de394b20e8078ebc96 (patch) | |
| tree | 2ab6edb67d2b73c27684399166765257e242d7c8 /src | |
| parent | 47799cc02b887c82ac386391fcf6c522f13943d0 (diff) | |
| parent | b242bbb073b501f7a4d4569c2d70cde522abbea3 (diff) | |
| download | emacs-90ec81f5b243b6b7b3ebe2de394b20e8078ebc96.tar.gz emacs-90ec81f5b243b6b7b3ebe2de394b20e8078ebc96.zip | |
Merge from origin/emacs-27
b242bbb073 (origin/emacs-27) ; lisp/org/org.el: Fix Version header.
e0fc939c5f Add more details to the "word processor" section
fda9b3e83a * src/Makefile.in (DO_CODESIGN): Fix expected architecture...
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index 39c0f12fe6c..19304cca040 100644 --- a/src/Makefile.in +++ b/src/Makefile.in | |||
| @@ -338,7 +338,7 @@ HAVE_PDUMPER = @HAVE_PDUMPER@ | |||
| 338 | 338 | ||
| 339 | ## ARM Macs require that all code have a valid signature. Since pump | 339 | ## ARM Macs require that all code have a valid signature. Since pump |
| 340 | ## invalidates the signature, we must re-sign to fix it. | 340 | ## invalidates the signature, we must re-sign to fix it. |
| 341 | DO_CODESIGN=$(patsubst aarch64-apple-darwin%,yes,@configuration@) | 341 | DO_CODESIGN=$(patsubst arm-apple-darwin%,yes,@configuration@) |
| 342 | 342 | ||
| 343 | # 'make' verbosity. | 343 | # 'make' verbosity. |
| 344 | AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ | 344 | AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ |