Commitdda3ad2

committed

Merge pull requestfsharp#10 from killerswan/master

renamed the F# launch scripts to avoid a name collision with the Scala fast offline compiler

2 parentscc126f2 +ac7d60d commitdda3ad2Copy full SHA for dda3ad2

File tree

-3

lines changed

-3

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -101,12 +101,12 @@ install-lib-2 install-lib-4:`
`101`	`101`	`$(INSTALL_LIB)$(outdir)Microsoft.FSharp.targets$(DESTDIR)/$(libdir)mono/$(TARGET)/;`
`102`	`102`
`103`	`103`	`install-bin-2install-bin-4:`
`104`		`-sed -e's,[@]DIR[@],$(libdir)mono/$(TARGET),g' -e's,[@]TOOL[@],$(ASSEMBLY),g'<$(topdir)launcher.in>$(outdir)$(NAME)$(VERSION)`
`105`		`-chmod +x$(outdir)$(NAME)$(VERSION)`
	`104`	`+sed -e's,[@]DIR[@],$(libdir)mono/$(TARGET),g' -e's,[@]TOOL[@],$(ASSEMBLY),g'<$(topdir)launcher.in>$(outdir)$(subst fs,fsharp,$(NAME))$(VERSION)`
	`105`	`+chmod +x$(outdir)$(subst fs,fsharp,$(NAME))$(VERSION)`
`106`	`106`	`@mkdir -p$(DESTDIR)/$(libdir)`
`107`	`107`	`@mkdir -p$(DESTDIR)/$(bindir)`
`108`	`108`	`$(INSTALL_LIB)$(outdir)$(ASSEMBLY)$(DESTDIR)$(libdir)mono/$(TARGET)`
`109`		`-$(INSTALL_BIN)$(outdir)$(NAME)$(VERSION)$(DESTDIR)/$(bindir)`
	`109`	`+$(INSTALL_BIN)$(outdir)$(subst fs,fsharp,$(NAME))$(VERSION)$(DESTDIR)/$(bindir)`
`110`	`110`
`111`	`111`	`$(objdir)$(objdir)$(TARGET_2_0)$(objdir)$(TARGET_4_0):`
`112`	`112`	`mkdir -p$@`

Comments

(0)