Commit473bcd4

committed

install: symlink libs too from 4.5 to 4.0

This commit was incomplete because it only linkedexecutables, not libraries:fsharp@5cc6d40

1 parent09be1cb commit473bcd4Copy full SHA for 473bcd4

File tree

-2

lines changed

-2

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -79,5 +79,5 @@ $(tmpdir)FSCore.resources: $(srcdir)FSCore.resx`
`79`	`79`
`80`	`80`	`include$(topdir)/src/fsharp/targets.make`
`81`	`81`
`82`		`-install: install-lib-2 install-lib-4`
	`82`	`+install: install-lib-2 install-lib-4 install-lib-4-5`
`83`	`83`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -37,5 +37,5 @@ $(tmpdir)FSIstrings.resources: $(srcdir)/FSIstrings.txt`
`37`	`37`
`38`	`38`	`include$(topdir)/src/fsharp/targets.make`
`39`	`39`
`40`		`-install: install-bin-2 install-bin-4`
	`40`	`+install: install-bin-2 install-bin-4 install-bin-4-5`
`41`	`41`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -107,6 +107,13 @@ install-lib-2 install-lib-4:`
`107`	`107`	`$(INSTALL_LIB)$(outdir)Microsoft.FSharp.targets$(DESTDIR)/$(libdir)mono/$(TARGET)/;`
`108`	`108`	`ln -fs$(DESTDIR)/$(libdir)mono/$(TARGET)/Microsoft.FSharp.targets$(DESTDIR)/$(libdir)mono/Microsoft\F#/v$(TARGET)/Microsoft.FSharp.Targets`
`109`	`109`
	`110`	`+install-lib-4-5: install-lib-4`
	`111`	`+@iftest -e$(DESTDIR)$(libdir)mono/4.5/;then\`
	`112`	`+ln -fs$(DESTDIR)$(libdir)mono/4.0/$(ASSEMBLY)$(DESTDIR)$(libdir)mono/4.5/$(ASSEMBLY);\`
	`113`	`+ln -fs$(DESTDIR)$(libdir)mono/4.0/$(NAME).sigdata$(DESTDIR)$(libdir)mono/4.5/$(NAME).sigdata;\`
	`114`	`+ln -fs$(DESTDIR)$(libdir)mono/4.0/$(NAME).optdata$(DESTDIR)$(libdir)mono/4.5/$(NAME).optdata;\`
	`115`	`+fi`
	`116`	`+`
`110`	`117`	`install-bin-2install-bin-4:`
`111`	`118`	`sed -e's,[@]DIR[@],$(libdir)mono/$(TARGET),g' -e's,[@]TOOL[@],$(ASSEMBLY),g'<$(topdir)launcher.in>$(outdir)$(subst fs,fsharp,$(NAME))$(VERSION)`
`112`	`119`	`chmod +x$(outdir)$(subst fs,fsharp,$(NAME))$(VERSION)`

Comments

(0)