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

Commitb542cd5

Browse files
committed
remove incorrect installation directories
1 parent7230d39 commitb542cd5

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,5 @@ do-final: do-4-0
3737

3838
clean: clean-4-0
3939

40-
install: install-lib-2 install-lib-4 install-lib-4-5
40+
install: install-lib-4 install-lib-4-5
4141

‎src/fsharp/targets.make‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -156,9 +156,10 @@ install-lib-2 install-lib-2-1 install-lib-4:
156156
gacutil -i$(outdir)$(ASSEMBLY) -root$(DESTDIR)$(libdir) -package$(TARGET)
157157
@iftest -e$(outdir)Microsoft.FSharp.Targets;then\
158158
$(INSTALL_LIB)$(outdir)Microsoft.FSharp.Targets$(DESTDIR)$(gacdir)/$(TARGET)/;\
159+
@mkdir -p$(tmpdir)
159160
echo'<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">'>$(tmpdir)Microsoft.FSharp.Targets;\
160161
echo' <Import Project="$(DESTDIR)$(gacdir)/$(TARGET)/Microsoft.FSharp.Targets" />'>>$(tmpdir)Microsoft.FSharp.Targets;\
161-
echo'</Project>'>>$(tmpdir)Microsoft.FSharp.Targets;\
162+
echo'</Project>'>>$(tmpdir)Microsoft.FSharp.Targets;\
162163
mkdir -p$(DESTDIR)$(gacdir)/Microsoft\F#/v$(TARGET)/;\
163164
mkdir -p$(DESTDIR)$(gacdir)/Microsoft\SDKs/F#/3.0/Framework/v$(TARGET)/;\
164165
mkdir -p$(DESTDIR)$(gacdir)/Microsoft\SDKs/F#/3.1/Framework/v$(TARGET)/;\
@@ -168,10 +169,8 @@ install-lib-2 install-lib-2-1 install-lib-4:
168169
$(INSTALL_LIB)$(tmpdir)Microsoft.FSharp.Targets$(DESTDIR)$(gacdir)/Microsoft\F#/v$(TARGET)/;\
169170
$(INSTALL_LIB)$(tmpdir)Microsoft.FSharp.Targets$(DESTDIR)$(gacdir)/Microsoft\SDKs/F#/3.0/Framework/v$(TARGET)/;\
170171
$(INSTALL_LIB)$(tmpdir)Microsoft.FSharp.Targets$(DESTDIR)$(gacdir)/Microsoft\SDKs/F#/3.1/Framework/v$(TARGET)/;\
171-
$(INSTALL_LIB)$(tmpdir)Microsoft.FSharp.Targets$(DESTDIR)$(gacdir)/Microsoft\SDKs/F#/3.2/Framework/v$(TARGET)/;\
172172
$(INSTALL_LIB)$(tmpdir)Microsoft.FSharp.Targets$(DESTDIR)$(gacdir)/xbuild/Microsoft/VisualStudio/v/FSharp/;\
173173
$(INSTALL_LIB)$(tmpdir)Microsoft.FSharp.Targets$(DESTDIR)$(gacdir)/xbuild/Microsoft/VisualStudio/v12.0/FSharp/;\
174-
$(INSTALL_LIB)$(tmpdir)Microsoft.FSharp.Targets$(DESTDIR)$(gacdir)/xbuild/Microsoft/VisualStudio/v14.0/FSharp/;\
175174
fi
176175
@iftest -e$(outdir)Microsoft.Portable.FSharp.Targets;then\
177176
$(INSTALL_LIB)$(outdir)Microsoft.Portable.FSharp.Targets$(DESTDIR)$(gacdir)/$(TARGET)/;\
@@ -187,10 +186,8 @@ install-lib-2 install-lib-2-1 install-lib-4:
187186
$(INSTALL_LIB)$(tmpdir)Microsoft.Portable.FSharp.Targets$(DESTDIR)$(gacdir)/Microsoft\F#/v$(TARGET)/;\
188187
$(INSTALL_LIB)$(tmpdir)Microsoft.Portable.FSharp.Targets$(DESTDIR)$(gacdir)/Microsoft\SDKs/F#/3.0/Framework/v$(TARGET)/;\
189188
$(INSTALL_LIB)$(tmpdir)Microsoft.Portable.FSharp.Targets$(DESTDIR)$(gacdir)/Microsoft\SDKs/F#/3.1/Framework/v$(TARGET)/;\
190-
$(INSTALL_LIB)$(tmpdir)Microsoft.Portable.FSharp.Targets$(DESTDIR)$(gacdir)/Microsoft\SDKs/F#/3.2/Framework/v$(TARGET)/;\
191189
$(INSTALL_LIB)$(tmpdir)Microsoft.Portable.FSharp.Targets$(DESTDIR)$(gacdir)/xbuild/Microsoft/VisualStudio/v/FSharp/;\
192190
$(INSTALL_LIB)$(tmpdir)Microsoft.Portable.FSharp.Targets$(DESTDIR)$(gacdir)/xbuild/Microsoft/VisualStudio/v12.0/FSharp/;\
193-
$(INSTALL_LIB)$(tmpdir)Microsoft.Portable.FSharp.Targets$(DESTDIR)$(gacdir)/xbuild/Microsoft/VisualStudio/v14.0/FSharp/;\
194191
fi
195192
@iftest -e$(outdir)$(NAME).xml;then\
196193
$(INSTALL_LIB)$(outdir)$(NAME).xml$(DESTDIR)$(gacdir)/gac/$(NAME)/$(VERSION)__$(TOKEN);\

0 commit comments

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