1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
|
Index: fsharp/launcher.in
===================================================================
--- fsharp.orig/launcher.in
+++ fsharp/launcher.in
@@ -21,4 +21,4 @@ fi
# location of the default FSharp install in order to find the FSharp compiler binaries (see
# fsharpbinding/MonoDevelop.FSharpBinding/Services/CompilerLocationUtils.fs). That's a pretty unfortunate
# way of finding those binaries. And really should be changed.
-$EXEC @MONOBINDIR@/mono $DEBUG $MONO_OPTIONS @DIR@/@TOOL@ --exename:$(basename "$0") "$@"
+SILLY_ENV_HACK_FOR_REGEX=mono $EXEC cli $DEBUG $MONO_OPTIONS @DIR@/@TOOL@ --exename:$(basename "$0") "$@"
Index: fsharp/src/fsharp/targets.make
===================================================================
--- fsharp.orig/src/fsharp/targets.make
+++ fsharp/src/fsharp/targets.make
@@ -184,9 +184,11 @@ install-lib-net40:
# The binaries fsc.exe and fsi.exe only get installed for Mono 4.5 profile
# This also installs 'fsharpc' and 'fsharpi'
+#
+# Debian patch - Point fsharpc and fsharpi at our install paths, not the GAC.
install-bin:
chmod +x $(outdir)$(ASSEMBLY)
- sed -e 's,[@]DIR[@],$(gacdir)/$(TARGET),g' -e 's,[@]TOOL[@],$(ASSEMBLY),g' -e 's,[@]MONOBINDIR[@],$(monobindir),g' < $(topdir)launcher > $(outdir)$(subst fs,fsharp,$(NAME))
+ sed -e "s,[@]DIR[@],/usr/lib/cli/fsharp,g" -e 's,[@]TOOL[@],$(ASSEMBLY),g' < $(topdir)launcher > $(outdir)$(subst fs,fsharp,$(NAME))
chmod +x $(outdir)$(subst fs,fsharp,$(NAME))
@mkdir -p $(DESTDIR)$(gacdir)/$(TARGET)
@mkdir -p $(DESTDIR)$(bindir)
|
