Skip to content
This repository
Browse code

install: symlink libs too from 4.5 to 4.0

This commit was incomplete because it only linked
executables, not libraries:

5cc6d40
  • Loading branch information...
commit 473bcd4f8526e0e5ca3de099b55206c38539c426 1 parent 09be1cb
Andres G. Aragoneses knocte authored
2  src/fsharp/FSharp.Core/Makefile.in
@@ -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
2  src/fsharp/fsi/Makefile.in
@@ -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
7 src/fsharp/targets.make
@@ -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 + @if test -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-2 install-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)

0 comments on commit 473bcd4

Please sign in to comment.
Something went wrong with that request. Please try again.