Skip to content

Commit ac6b0fb

Browse files
[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 9c38206) Co-authored-by: Moritz Neeb <nt4u@kpvn.de>
1 parent 456cf8b commit ac6b0fb

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
@@ -1918,8 +1918,7 @@ altinstall: commoninstall
19181918
.PHONY: commoninstall
19191919
commoninstall: check-clean-src @FRAMEWORKALTINSTALLFIRST@ \
19201920
altbininstall libinstall inclinstall libainstall \
1921-
sharedinstall altmaninstall \
1922-
@FRAMEWORKALTINSTALLLAST@
1921+
sharedinstall altmaninstall @FRAMEWORKALTINSTALLLAST@
19231922

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

0 commit comments

Comments
 (0)