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

Commitbc92c4f

Browse files
author
Andreia Gaita
committed
Add DESTDIR support. Install assemblies on mono/fsharp-VERSION.
1 parent5fcaef5 commitbc92c4f

File tree

2 files changed

+13
-17
lines changed

2 files changed

+13
-17
lines changed

‎config.make.in‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ prefix := @prefix@
33
topdir := @abs_top_srcdir@/
44
builddir := @abs_top_builddir@/
55
libdir := ${prefix}/lib/
6-
installdir := ${prefix}/bin/
7-
monodir := @MONODIR@
6+
bindir := ${prefix}/bin/
7+
monodir := @MONODIR@/
88
libdir2 := $(monodir)2.0/
99
libdir35 := $(monodir)3.5/
1010
libdir4 := $(monodir)4.0/
1111
tooldir := $(topdir)lib/bootstrap/2.0/
1212

13-
bindir = $(bootstrap)/$(TARGET)/
13+
bootstrapdir = $(bootstrap)/$(TARGET)/
1414
tmpdir = .libs/
1515
objdir = $(tmpdir)$(TARGET)/
1616
protodir = $(builddir)/lib/proto/$(TARGET)/
@@ -90,7 +90,7 @@ INSTALL_BIN = $(INSTALL) -c -m 755
9090
INSTALL_LIB = $(INSTALL_BIN)
9191

9292
EXTRA_DIST = configure
93-
NO_DIST = .gitignore lib
93+
NO_DIST = .gitignore lib/debug lib/proto lib/release
9494

9595
DEFAULT: all
9696

‎src/fsharp/targets.make‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -70,33 +70,29 @@ do-4-0: $(objdir) $(objdir)$(TARGET_2_0) $(objdir)$(TARGET_4_0) $(objdir)$(TARGE
7070
fi
7171

7272
install-lib-2: TARGET :=$(TARGET_2_0)
73-
install-lib-2: libdir =$(libdir2)
7473
install-lib-4: TARGET :=$(TARGET_4_0)
75-
install-lib-4: libdir =$(libdir4)
7674
install-bin-2: TARGET :=$(TARGET_2_0)
7775
install-bin-2: VERSION := 2
78-
install-bin-2: libdir =$(libdir2)
7976
install-bin-4: TARGET :=$(TARGET_4_0)
80-
install-bin-4: libdir =$(libdir4)
8177

8278
install-lib-2install-lib-4:
8379
@echo"Installing$(ASSEMBLY)"
84-
@gacutil -i$(outdir)$(ASSEMBLY)
85-
@ln -s -f$(monodir)gac/$(NAME)/$(TARGET).0.0__b03f5f7f11d50a3a/$(ASSEMBLY)$(libdir)
86-
87-
do_subst = sed -e 's,[@]DIR[@],$(libdir),g' -e 's,[@]TOOL[@],fsc.exe,g'
80+
@mkdir -p$(DESTDIR)/$(libdir)
81+
@gacutil -i$(outdir)$(ASSEMBLY) -root$(DESTDIR)/$(libdir) -package fsharp-$(TARGET)
8882

8983
install-bin-2install-bin-4:
90-
$(do_subst)<$(topdir)launcher.in>$(outdir)$(NAME)$(VERSION)
84+
sed -e's,[@]DIR[@],$(DESTDIR)$(libdir)mono/fsharp-$(TARGET),g' -e's,[@]TOOL[@],fsc.exe,g'<$(topdir)launcher.in>$(outdir)$(NAME)$(VERSION)
9185
chmod +x$(outdir)$(NAME)$(VERSION)
92-
$(INSTALL_LIB)$(outdir)$(ASSEMBLY)$(libdir)
93-
$(INSTALL_BIN)$(outdir)$(NAME)$(VERSION)$(installdir)
86+
@mkdir -p$(DESTDIR)/$(libdir)
87+
@mkdir -p$(DESTDIR)/$(bindir)
88+
$(INSTALL_LIB)$(outdir)$(ASSEMBLY)$(DESTDIR)$(libdir)mono/fsharp-$(TARGET)
89+
$(INSTALL_BIN)$(outdir)$(NAME)$(VERSION)$(DESTDIR)/$(bindir)
9490

9591
$(objdir)$(objdir)$(TARGET_2_0)$(objdir)$(TARGET_4_0):
9692
mkdir -p$@
9793

9894
$(objdir)$(TARGET_2_0)/$(ASSEMBLY):$(RESOURCES)$(SOURCES)
99-
MONO_PATH=$(bindir) mono$(MONO_OPTIONS) --debug$(FSC) -o:$(objdir)$(ASSEMBLY)$(REFERENCES)$(DEFINES)$(FLAGS)$(patsubst%,--resource:%,$(RESOURCES))$(SOURCES)
95+
MONO_PATH=$(bootstrapdir) mono$(MONO_OPTIONS) --debug$(FSC) -o:$(objdir)$(ASSEMBLY)$(REFERENCES)$(DEFINES)$(FLAGS)$(patsubst%,--resource:%,$(RESOURCES))$(SOURCES)
10096

10197
$(objdir)$(TARGET_4_0)/$(ASSEMBLY):$(RESOURCES)$(SOURCES)
102-
MONO_PATH=$(bindir) mono$(MONO_OPTIONS) --debug$(FSC) -o:$(objdir)$(ASSEMBLY)$(REFERENCES)$(DEFINES)$(FLAGS)$(patsubst%,--resource:%,$(RESOURCES))$(SOURCES)
98+
MONO_PATH=$(bootstrapdir) mono$(MONO_OPTIONS) --debug$(FSC) -o:$(objdir)$(ASSEMBLY)$(REFERENCES)$(DEFINES)$(FLAGS)$(patsubst%,--resource:%,$(RESOURCES))$(SOURCES)

0 commit comments

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