Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit68c30e6

Browse files
author
Andreia Gaita
committed
Fix paths
1 parentbc92c4f commit68c30e6

File tree

7 files changed

+31
-31
lines changed

7 files changed

+31
-31
lines changed

‎config.make.in‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ builddir := @abs_top_builddir@/
55
libdir := ${prefix}/lib/
66
bindir := ${prefix}/bin/
77
monodir := @MONODIR@/
8-
libdir2 := $(monodir)2.0/
9-
libdir35 := $(monodir)3.5/
10-
libdir4 := $(monodir)4.0/
8+
monolibdir2 := $(monodir)2.0/
9+
monolibdir35 := $(monodir)3.5/
10+
monolibdir4 := $(monodir)4.0/
1111
tooldir := $(topdir)lib/bootstrap/2.0/
1212

1313
bootstrapdir = $(bootstrap)/$(TARGET)/
@@ -66,23 +66,23 @@ DEFINES_4_0 = \
6666
--define:FX_ATLEAST_40
6767

6868
REFERENCES_2_0 = \
69-
-r:$(libdir)Microsoft.Build.Engine.dll \
70-
-r:$(libdir)Microsoft.Build.Framework.dll \
71-
-r:$(libdir35)Microsoft.Build.Tasks.v3.5.dll \
72-
-r:$(libdir35)Microsoft.Build.Utilities.v3.5.dll \
73-
-r:$(libdir)mscorlib.dll \
74-
-r:$(libdir)System.Core.dll \
75-
-r:$(libdir)System.dll
69+
-r:$(monolibdir)Microsoft.Build.Engine.dll \
70+
-r:$(monolibdir)Microsoft.Build.Framework.dll \
71+
-r:$(monolibdir35)Microsoft.Build.Tasks.v3.5.dll \
72+
-r:$(monolibdir35)Microsoft.Build.Utilities.v3.5.dll \
73+
-r:$(monolibdir)mscorlib.dll \
74+
-r:$(monolibdir)System.Core.dll \
75+
-r:$(monolibdir)System.dll
7676

7777
REFERENCES_4_0 = \
78-
-r:$(libdir)Microsoft.Build.Engine.dll \
79-
-r:$(libdir)Microsoft.Build.Framework.dll \
80-
-r:$(libdir35)Microsoft.Build.Tasks.v3.5.dll \
81-
-r:$(libdir35)Microsoft.Build.Utilities.v3.5.dll \
82-
-r:$(libdir)mscorlib.dll \
83-
-r:$(libdir)System.Core.dll \
84-
-r:$(libdir)System.dll \
85-
-r:$(libdir)System.Numerics.dll
78+
-r:$(monolibdir)Microsoft.Build.Engine.dll \
79+
-r:$(monolibdir)Microsoft.Build.Framework.dll \
80+
-r:$(monolibdir35)Microsoft.Build.Tasks.v3.5.dll \
81+
-r:$(monolibdir35)Microsoft.Build.Utilities.v3.5.dll \
82+
-r:$(monolibdir)mscorlib.dll \
83+
-r:$(monolibdir)System.Core.dll \
84+
-r:$(monolibdir)System.dll \
85+
-r:$(monolibdir)System.Numerics.dll
8686

8787
INSTALL = $(SHELL) $(topdir)install-sh
8888
INSTALL_DATA = $(INSTALL) -c -m 644

‎src/fsharp/FSharp.Build-proto/Makefile.in‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ include @abs_top_builddir@/config.make
77

88
CONFIG=proto
99

10-
FSC=$(bindir)fsc.exe
10+
FSC=$(bootstrapdir)fsc.exe
1111

1212
FLAGS += --target:library
1313

1414
DEFINES +=\
1515
--define:BUILDING_WITH_LKG
1616

1717
REFERENCES +=\
18-
-r:$(bindir)FSharp.Core.dll
18+
-r:$(bootstrapdir)FSharp.Core.dll
1919

2020
sources=\
2121
$(objdir)FSBuild.fs\

‎src/fsharp/FSharp.Compiler-proto/Makefile.in‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ include @abs_top_builddir@/config.make
77

88
CONFIG=proto
99

10-
FSC=$(bindir)fsc.exe
10+
FSC=$(bootstrapdir)fsc.exe
1111

1212
FLAGS += --target:library
1313

@@ -20,7 +20,7 @@ DEFINES += \
2020
--define:TRYING_TO_FIX_4577
2121

2222
REFERENCES +=\
23-
-r:$(bindir)FSharp.Core.dll\
23+
-r:$(bootstrapdir)FSharp.Core.dll\
2424
-r:Mono.Security.dll
2525

2626
sources =\

‎src/fsharp/FSharp.Core/Makefile.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ FLAGS_2_0 += \
1616
FLAGS_4_0 +=\
1717
$(FINAL_FLAGS)\
1818
$(FLAGS_2_0)\
19-
--compiling-fslib-mscorlib40:$(libdir)mscorlib.dll
19+
--compiling-fslib-mscorlib40:$(monolibdir)mscorlib.dll
2020

2121
DEFINES +=\
2222
--define:RUNTIME

‎src/fsharp/Fsc-proto/Makefile.in‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ include @abs_top_builddir@/config.make
77

88
CONFIG=proto
99

10-
FSC=$(bindir)fsc.exe
10+
FSC=$(bootstrapdir)fsc.exe
1111

1212
FLAGS += --target:exe
1313

@@ -17,10 +17,10 @@ DEFINES += \
1717
--define:COMPILER
1818

1919
REFERENCES +=\
20-
-r:$(bindir)FSharp.Core.dll\
20+
-r:$(bootstrapdir)FSharp.Core.dll\
2121
-r:$(outdir)FSharp.Compiler-proto.dll\
22-
-r:$(libdir)System.Runtime.Remoting.dll\
23-
-r:$(libdir)System.Windows.Forms.dll
22+
-r:$(monolibdir)System.Runtime.Remoting.dll\
23+
-r:$(monolibdir)System.Windows.Forms.dll
2424

2525
sources =\
2626
$(tmpdir)FSCstrings.fs\

‎src/fsharp/Fsc/Makefile.in‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ FLAGS += \
1515
REFERENCES +=\
1616
-r:$(outdir)FSharp.Core.dll\
1717
-r:$(outdir)FSharp.Compiler.dll\
18-
-r:$(libdir)System.Runtime.Remoting.dll\
19-
-r:$(libdir)System.Windows.Forms.dll
18+
-r:$(monolibdir)System.Runtime.Remoting.dll\
19+
-r:$(monolibdir)System.Windows.Forms.dll
2020

2121
sources =\
2222
$(tmpdir)FSCstrings.fs\

‎src/fsharp/targets.make‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ do-2-0: REFERENCES += $(REFERENCES_2_0)
3232
do-2-0: FLAGS +=$(FLAGS_2_0)
3333
do-2-0: TARGET :=$(TARGET_2_0)
3434
do-2-0: VERSION :=$(VERSION_2_0)
35-
do-2-0:libdir =$(libdir2)
35+
do-2-0:monolibdir =$(monolibdir2)
3636
do-2-0:$(objdir)$(objdir)$(TARGET_2_0)$(objdir)$(TARGET_4_0)$(objdir)$(TARGET_2_0)/$(ASSEMBLY)
3737
@mkdir -p$(outdir)
3838
@cp$(objdir)$(ASSEMBLY)$(outdir)
@@ -53,7 +53,7 @@ do-4-0: REFERENCES += $(REFERENCES_4_0)
5353
do-4-0: FLAGS +=$(FLAGS_4_0)
5454
do-4-0: TARGET :=$(TARGET_4_0)
5555
do-4-0: VERSION :=$(VERSION_4_0)
56-
do-4-0:libdir =$(libdir4)
56+
do-4-0:monolibdir =$(monolibdir4)
5757
do-4-0:$(objdir)$(objdir)$(TARGET_2_0)$(objdir)$(TARGET_4_0)$(objdir)$(TARGET_4_0)/$(ASSEMBLY)
5858
@mkdir -p$(outdir)
5959
@cp$(objdir)$(ASSEMBLY)$(outdir)

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp