]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
[3.12] gh-75371: reformat Makefile.pre.in to accommodate for empty FRAMEWORKALTINSTAL...
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Sun, 23 Jul 2023 09:34:28 +0000 (02:34 -0700)
committerGitHub <noreply@github.com>
Sun, 23 Jul 2023 09:34:28 +0000 (11:34 +0200)
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@kpvn.de>
Makefile.pre.in

index 8dacb570ccafab0277f4782cd881b7bb3dae1927..393eec7b8d324c52e956ec7ad7247d99fe243416 100644 (file)
@@ -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)