Skip to content

Commit 5a74566

Browse files
ambvzormit
andauthored
[3.11] gh-75371: reformat Makefile.pre.in to accommodate for empty FRAMEWORKALTINSTALLLAST (GH-107035) (#107050)
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 9c38206) Co-authored-by: Moritz Neeb <[email protected]>
1 parent ec8718d commit 5a74566

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

Makefile.pre.in

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1764,8 +1764,7 @@ altinstall: commoninstall
17641764

17651765
commoninstall: check-clean-src @FRAMEWORKALTINSTALLFIRST@ \
17661766
altbininstall libinstall inclinstall libainstall \
1767-
sharedinstall oldsharedinstall altmaninstall \
1768-
@FRAMEWORKALTINSTALLLAST@
1767+
sharedinstall oldsharedinstall altmaninstall @FRAMEWORKALTINSTALLLAST@
17691768

17701769
# Install shared libraries enabled by Setup
17711770
DESTDIRS= $(exec_prefix) $(LIBDIR) $(BINLIBDEST) $(DESTSHARED)

0 commit comments

Comments
 (0)