Skip to content

Commit

Permalink
[3.12] gh-75371: reformat Makefile.pre.in to accommodate for empty FR…
Browse files Browse the repository at this point in the history
…AMEWORKALTINSTALLLAST (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 <[email protected]>
  • Loading branch information
miss-islington and zormit authored Jul 23, 2023
1 parent 456cf8b commit ac6b0fb
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions Makefile.pre.in
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit ac6b0fb

Please sign in to comment.