[Python-checkins] [3.12] gh-75371: reformat Makefile.pre.in to accommodate for empty FRAMEWORKALTINSTALLLAST (GH-107035) (#107049)
ambv
webhook-mailer at python.org
Sun Jul 23 05:34:32 EDT 2023
https://github.com/python/cpython/commit/ac6b0fbdb870c002633bffc21d04e621abc962fb
commit: ac6b0fbdb870c002633bffc21d04e621abc962fb
branch: 3.12
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2023-07-23T11:34:28+02:00
summary:
[3.12] gh-75371: reformat Makefile.pre.in to accommodate for empty FRAMEWORKALTINSTALLLAST (GH-107035) (#107049)
gh-75371: reformat Makefile.pre.in to accommodate for empty FRAMEWORKALTINSTALLLAST (GH-107035)
in the case of an empty FRAMEWORKALTINSTALLLAST, this patch prevents leaving
an astray linebreak and two tabs in the resulting Makefile.
Before change:
```
.PHONY: commoninstall
commoninstall: check-clean-src \
altbininstall libinstall inclinstall libainstall \
sharedinstall altmaninstall \
```
After change (with empty FRAMEWORKALTINSTALLLAST):
```
.PHONY: commoninstall
commoninstall: check-clean-src \
altbininstall libinstall inclinstall libainstall \
sharedinstall altmaninstall
```
(cherry picked from commit 9c38206925246ab919cf558ac069ae9458720ba7)
Co-authored-by: Moritz Neeb <nt4u at kpvn.de>
files:
M Makefile.pre.in
diff --git a/Makefile.pre.in b/Makefile.pre.in
index 8dacb570ccafa..393eec7b8d324 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -1918,8 +1918,7 @@ altinstall: commoninstall
.PHONY: commoninstall
commoninstall: check-clean-src @FRAMEWORKALTINSTALLFIRST@ \
altbininstall libinstall inclinstall libainstall \
- sharedinstall altmaninstall \
- @FRAMEWORKALTINSTALLLAST@
+ sharedinstall altmaninstall @FRAMEWORKALTINSTALLLAST@
# Install shared libraries enabled by Setup
DESTDIRS= $(exec_prefix) $(LIBDIR) $(BINLIBDEST) $(DESTSHARED)
More information about the Python-checkins
mailing list