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

Commit83ba0fc

Browse files
committed
Respect --with-gacdir=/path/to/gac
Use parameter of --with-gacdir and MONODIR as a source for ROOTDIR ingacutil.
1 parent16c853f commit83ba0fc

File tree

3 files changed

+35
-31
lines changed

3 files changed

+35
-31
lines changed

‎config.make.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ topdir := @abs_top_srcdir@/
44
builddir := @abs_top_builddir@/
55
libdir := ${prefix}/lib/
66
bindir := ${prefix}/bin/
7+
monorootdir := @MONOROOTDIR@/
78
monodir := @MONODIR@/
89
monolibdir2 := $(monodir)2.0/
910

‎configure.ac‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,11 @@ fi
5757
if ! test -e $MONODIR/2.0/mscorlib.dll; then
5858
AC_ERROR(Couldn't find the mono gac directory or mscorlib.dll in the usual places. Set --with-gacdir=<path>)
5959
fi
60+
61+
MONOROOTDIR=$(cd "$MONODIR/.." && pwd)
62+
6063
AC_SUBST(MONODIR)
64+
AC_SUBST(MONOROOTDIR)
6165

6266
if test "x$MONO_SGEN" = "xno"; then
6367
mono_gc_options=

‎src/fsharp/targets.make‎

Lines changed: 30 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -144,57 +144,56 @@ install-bin-4: TARGET := $(TARGET_4_0)
144144
#
145145
install-lib-2install-lib-2-1install-lib-4:
146146
@echo"Installing$(ASSEMBLY)"
147-
@mkdir -p$(DESTDIR)/$(libdir)
148-
@mkdir -p$(DESTDIR)/$(libdir)mono/$(TARGET)
149-
gacutil -i$(outdir)$(ASSEMBLY) -root$(DESTDIR)/$(libdir) -package$(TARGET)
147+
@mkdir -p$(DESTDIR)$(monodir)/$(TARGET)
148+
gacutil -i$(outdir)$(ASSEMBLY) -root$(DESTDIR)$(monorootdir) -package$(TARGET)
150149
@iftest -e$(outdir)Microsoft.FSharp.targets;then\
151-
mkdir -p$(DESTDIR)/$(libdir)mono/Microsoft\F#/v$(TARGET)/;\
152-
mkdir -p$(DESTDIR)/$(libdir)mono/Microsoft\SDKs/F#/3.0/Framework/v$(TARGET)/;\
153-
ln -fs$(DESTDIR)/$(libdir)mono/$(TARGET)/$(ASSEMBLY)$(DESTDIR)/$(libdir)mono/Microsoft\F#/v$(TARGET)/$(ASSEMBLY);\
154-
ln -fs$(DESTDIR)/$(libdir)mono/$(TARGET)/$(ASSEMBLY)$(DESTDIR)/$(libdir)mono/Microsoft\SDKs/F#/3.0/Framework/v$(TARGET)/$(ASSEMBLY);\
155-
$(INSTALL_LIB)$(outdir)Microsoft.FSharp.targets$(DESTDIR)/$(libdir)mono/$(TARGET)/;\
156-
ln -fs$(DESTDIR)/$(libdir)mono/$(TARGET)/Microsoft.FSharp.targets$(DESTDIR)/$(libdir)mono/Microsoft\F#/v$(TARGET)/Microsoft.FSharp.targets;\
157-
ln -fs$(DESTDIR)/$(libdir)mono/$(TARGET)/Microsoft.FSharp.targets$(DESTDIR)/$(libdir)mono/Microsoft\SDKs/F#/3.0/Framework/v$(TARGET)/Microsoft.FSharp.targets;\
150+
mkdir -p$(DESTDIR)$(monodir)/Microsoft\F#/v$(TARGET)/;\
151+
mkdir -p$(DESTDIR)$(monodir)/Microsoft\SDKs/F#/3.0/Framework/v$(TARGET)/;\
152+
ln -fs$(DESTDIR)$(monodir)/$(TARGET)/$(ASSEMBLY)$(DESTDIR)$(monodir)/Microsoft\F#/v$(TARGET)/$(ASSEMBLY);\
153+
ln -fs$(DESTDIR)$(monodir)/$(TARGET)/$(ASSEMBLY)$(DESTDIR)$(monodir)/Microsoft\SDKs/F#/3.0/Framework/v$(TARGET)/$(ASSEMBLY);\
154+
$(INSTALL_LIB)$(outdir)Microsoft.FSharp.targets$(DESTDIR)$(monodir)/$(TARGET)/;\
155+
ln -fs$(DESTDIR)$(monodir)/$(TARGET)/Microsoft.FSharp.targets$(DESTDIR)$(monodir)/Microsoft\F#/v$(TARGET)/Microsoft.FSharp.targets;\
156+
ln -fs$(DESTDIR)$(monodir)/$(TARGET)/Microsoft.FSharp.targets$(DESTDIR)$(monodir)/Microsoft\SDKs/F#/3.0/Framework/v$(TARGET)/Microsoft.FSharp.targets;\
158157
fi
159158
@iftest -e$(outdir)$(NAME).xml;then\
160-
$(INSTALL_LIB)$(outdir)$(NAME).xml$(DESTDIR)/$(libdir)mono/gac/$(NAME)/$(VERSION)__$(TOKEN);\
161-
ln -fs ../gac/$(NAME)/$(VERSION)__$(TOKEN)/$(NAME).xml$(DESTDIR)/$(libdir)mono/$(TARGET)/$(NAME).xml;\
159+
$(INSTALL_LIB)$(outdir)$(NAME).xml$(DESTDIR)$(monodir)/gac/$(NAME)/$(VERSION)__$(TOKEN);\
160+
ln -fs ../gac/$(NAME)/$(VERSION)__$(TOKEN)/$(NAME).xml$(DESTDIR)$(monodir)/$(TARGET)/$(NAME).xml;\
162161
fi
163162
@iftest -e$(outdir)$(NAME).sigdata;then\
164-
$(INSTALL_LIB)$(outdir)$(NAME).sigdata$(DESTDIR)/$(libdir)mono/gac/$(NAME)/$(VERSION)__$(TOKEN);\
165-
ln -fs ../gac/$(NAME)/$(VERSION)__$(TOKEN)/$(NAME).sigdata$(DESTDIR)/$(libdir)mono/$(TARGET)/$(NAME).sigdata;\
163+
$(INSTALL_LIB)$(outdir)$(NAME).sigdata$(DESTDIR)$(monodir)/gac/$(NAME)/$(VERSION)__$(TOKEN);\
164+
ln -fs ../gac/$(NAME)/$(VERSION)__$(TOKEN)/$(NAME).sigdata$(DESTDIR)$(monodir)/$(TARGET)/$(NAME).sigdata;\
166165
fi
167166
@iftest -e$(outdir)$(NAME).optdata;then\
168-
$(INSTALL_LIB)$(outdir)$(NAME).optdata$(DESTDIR)/$(libdir)mono/gac/$(NAME)/$(VERSION)__$(TOKEN);\
169-
ln -fs ../gac/$(NAME)/$(VERSION)__$(TOKEN)/$(NAME).optdata$(DESTDIR)/$(libdir)mono/$(TARGET)/$(NAME).optdata;\
167+
$(INSTALL_LIB)$(outdir)$(NAME).optdata$(DESTDIR)$(monodir)/gac/$(NAME)/$(VERSION)__$(TOKEN);\
168+
ln -fs ../gac/$(NAME)/$(VERSION)__$(TOKEN)/$(NAME).optdata$(DESTDIR)$(monodir)/$(TARGET)/$(NAME).optdata;\
170169
fi
171170

172171
install-lib-4-5: install-lib-4
173-
@iftest -e$(DESTDIR)$(libdir)mono/4.5/;then\
174-
ln -fs$(DESTDIR)$(libdir)mono/4.0/$(ASSEMBLY)$(DESTDIR)$(libdir)mono/4.5/$(ASSEMBLY);\
175-
iftest -e$(DESTDIR)$(libdir)mono/4.0/$(ASSEMBLY).config;then \
176-
ln -fs$(DESTDIR)$(libdir)mono/4.0/$(ASSEMBLY).config$(DESTDIR)$(libdir)mono/4.5/$(ASSEMBLY).config;\
172+
@iftest -e$(DESTDIR)$(monodir)/4.5/;then\
173+
ln -fs$(DESTDIR)$(monodir)/4.0/$(ASSEMBLY)$(DESTDIR)$(monodir)/4.5/$(ASSEMBLY);\
174+
iftest -e$(DESTDIR)$(monodir)/4.0/$(ASSEMBLY).config;then \
175+
ln -fs$(DESTDIR)$(monodir)/4.0/$(ASSEMBLY).config$(DESTDIR)$(monodir)/4.5/$(ASSEMBLY).config;\
177176
fi;\
178-
iftest -e$(DESTDIR)$(libdir)mono/4.0/$(NAME).sigdata;then \
179-
ln -fs$(DESTDIR)$(libdir)mono/4.0/$(NAME).sigdata$(DESTDIR)$(libdir)mono/4.5/$(NAME).sigdata;\
177+
iftest -e$(DESTDIR)$(monodir)/4.0/$(NAME).sigdata;then \
178+
ln -fs$(DESTDIR)$(monodir)/4.0/$(NAME).sigdata$(DESTDIR)$(monodir)/4.5/$(NAME).sigdata;\
180179
fi;\
181-
iftest -e$(DESTDIR)$(libdir)mono/4.0/$(NAME).xml;then \
182-
ln -fs$(DESTDIR)$(libdir)mono/4.0/$(NAME).xml$(DESTDIR)$(libdir)mono/4.5/$(NAME).xml;\
180+
iftest -e$(DESTDIR)$(monodir)/4.0/$(NAME).xml;then \
181+
ln -fs$(DESTDIR)$(monodir)/4.0/$(NAME).xml$(DESTDIR)$(monodir)/4.5/$(NAME).xml;\
183182
fi;\
184-
iftest -e$(DESTDIR)$(libdir)mono/4.0/$(NAME).optdata;then \
185-
ln -fs$(DESTDIR)$(libdir)mono/4.0/$(NAME).optdata$(DESTDIR)$(libdir)mono/4.5/$(NAME).optdata;\
183+
iftest -e$(DESTDIR)$(monodir)/4.0/$(NAME).optdata;then \
184+
ln -fs$(DESTDIR)$(monodir)/4.0/$(NAME).optdata$(DESTDIR)$(monodir)/4.5/$(NAME).optdata;\
186185
fi;\
187186
fi
188187

189188
# The binaries fsc.exe and fsi.exe only get installed for Mono 4.0 profile
190189
# This also installs 'fsharpc' and 'fsharpi'
191190
install-bin-4:
192-
sed -e's,[@]DIR[@],$(libdir)mono/$(TARGET),g' -e's,[@]TOOL[@],$(ASSEMBLY),g'<$(topdir)launcher>$(outdir)$(subst fs,fsharp,$(NAME))$(VERSION)
191+
sed -e's,[@]DIR[@],$(monodir)/$(TARGET),g' -e's,[@]TOOL[@],$(ASSEMBLY),g'<$(topdir)launcher>$(outdir)$(subst fs,fsharp,$(NAME))$(VERSION)
193192
chmod +x$(outdir)$(subst fs,fsharp,$(NAME))$(VERSION)
194-
@mkdir -p$(DESTDIR)/$(libdir)
195-
@mkdir -p$(DESTDIR)/$(bindir)
196-
$(INSTALL_LIB)$(outdir)$(ASSEMBLY)$(DESTDIR)$(libdir)mono/$(TARGET)
197-
$(INSTALL_BIN)$(outdir)$(subst fs,fsharp,$(NAME))$(VERSION)$(DESTDIR)/$(bindir)
193+
@mkdir -p$(DESTDIR)$(monodir)/$(TARGET)
194+
@mkdir -p$(DESTDIR)$(bindir)
195+
$(INSTALL_LIB)$(outdir)$(ASSEMBLY)$(DESTDIR)$(monodir)/$(TARGET)
196+
$(INSTALL_BIN)$(outdir)$(subst fs,fsharp,$(NAME))$(VERSION)$(DESTDIR)$(bindir)
198197

199198

200199
$(objdir)$(objdir)$(TARGET_2_0)$(objdir)$(TARGET_2_1)$(objdir)$(TARGET_4_0):

0 commit comments

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