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

Commit68bbffa

Browse files
committed
install: avoid using DESTDIR in .Targets files
$DESTDIR is only meant to be a prefix to the prefix specifiedby the user, at install time. That is, if the prefix specifiedwas /usr, and $DESTDIR is assigned the value /tmp when runningthe target 'make install', then all the files installed shouldbe in /tmp/usr, but their contents should never reference thistemporal path /tmp/usr, but /usr, because DESTDIR is onlymeant to be used as a hook to where leave the binaries generatedfor a certain prefix.Fixes github issuefsharp#204, reported by Henrik Feldt.
1 parent48f6037 commit68bbffa

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

‎src/fsharp/targets.make‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ install-lib-2 install-lib-2-1 install-lib-4:
158158
$(INSTALL_LIB)$(outdir)Microsoft.FSharp.Targets$(DESTDIR)$(gacdir)/$(TARGET)/;\
159159
mkdir -p$(tmpdir);\
160160
echo'<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">'>$(tmpdir)Microsoft.FSharp.Targets;\
161-
echo' <Import Project="$(DESTDIR)$(gacdir)/$(TARGET)/Microsoft.FSharp.Targets" />'>>$(tmpdir)Microsoft.FSharp.Targets;\
161+
echo' <Import Project="$(gacdir)/$(TARGET)/Microsoft.FSharp.Targets" />'>>$(tmpdir)Microsoft.FSharp.Targets;\
162162
echo'</Project>'>>$(tmpdir)Microsoft.FSharp.Targets;\
163163
mkdir -p$(DESTDIR)$(gacdir)/Microsoft\F#/v$(TARGET)/;\
164164
mkdir -p$(DESTDIR)$(gacdir)/Microsoft\SDKs/F#/3.0/Framework/v$(TARGET)/;\
@@ -175,7 +175,7 @@ install-lib-2 install-lib-2-1 install-lib-4:
175175
@iftest -e$(outdir)Microsoft.Portable.FSharp.Targets;then\
176176
$(INSTALL_LIB)$(outdir)Microsoft.Portable.FSharp.Targets$(DESTDIR)$(gacdir)/$(TARGET)/;\
177177
echo'<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">'>$(tmpdir)Microsoft.Portable.FSharp.Targets;\
178-
echo' <Import Project="$(DESTDIR)$(gacdir)/$(TARGET)/Microsoft.Portable.FSharp.Targets" />'>>$(tmpdir)Microsoft.Portable.FSharp.Targets;\
178+
echo' <Import Project="$(gacdir)/$(TARGET)/Microsoft.Portable.FSharp.Targets" />'>>$(tmpdir)Microsoft.Portable.FSharp.Targets;\
179179
echo'</Project>'>>$(tmpdir)Microsoft.Portable.FSharp.Targets;\
180180
mkdir -p$(DESTDIR)$(gacdir)/Microsoft\F#/v$(TARGET)/;\
181181
mkdir -p$(DESTDIR)$(gacdir)/Microsoft\SDKs/F#/3.0/Framework/v$(TARGET)/;\

0 commit comments

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