Merge lp:~ballogy/libindicate/fix-mono-location into lp:libindicate/0.7

Proposed by Ted Gould on 2012-02-09
Status: Work in progress
Proposed branch: lp:~ballogy/libindicate/fix-mono-location
Merge into: lp:libindicate/0.7
Diff against target: 101 lines (+14/-14) 4 files modified
To merge this branch: bzr merge lp:~ballogy/libindicate/fix-mono-location
Reviewer Review Type Date Requested Status
Charles Kerr 2012-02-09 Needs Information on 2012-03-13
Review via email: mp+92313@code.launchpad.net

This proposal supersedes a proposal from 2011-11-23.

Description of the Change

This change moves the location of the mono bindings install dir from /usr/lib/indicate{,-gtk}-sharp-0.1 to the standard place: /usr/lib/mono/indicate{,-gtk}-sharp.

To post a comment you must log in.
Ted Gould (ted) wrote :

I'm honestly not sure on this one. I've not been able to figure out what the right answer here. Do you know of any documentation from the Mono project on how this should work?

Charles Kerr (charlesk) wrote :

I don't know enough about Mono to comment on this intelligently, but on a lighter level I notice that you've dropped the quotes from GACUTIL_FLAGS, which was probably not intentional.

Charles Kerr (charlesk) wrote :

ballogy: ping

review: Needs Information

Unmerged revisions

439. By György Balló on 2011-11-23

Fix mono bindings location

Preview Diff

1=== modified file 'bindings/mono/indicate-gtk/Makefile.am'
2--- bindings/mono/indicate-gtk/Makefile.am 2010-12-08 23:00:50 +0000
3+++ bindings/mono/indicate-gtk/Makefile.am 2012-02-09 16:36:18 +0000
4@@ -11,7 +11,7 @@
5 METADATA = $(ASSEMBLY_NAME)-api.metadata
6 ASSEMBLY = $(ASSEMBLY_NAME)-sharp.dll
7 TARGET = $(ASSEMBLY) $(ASSEMBLY).config
8-assemblydir = $(libdir)/$(ASSEMBLY_NAME)-sharp-0.1
9+assemblydir = $(libdir)/mono/$(ASSEMBLY_NAME)-sharp
10 assembly_DATA = $(TARGET)
11 CLEANFILES = $(ASSEMBLY) \
12 $(ASSEMBLY).mdb \
13@@ -32,7 +32,7 @@
14 $(ASSEMBLY_NAME).snk \
15 $(customs)
16
17-GACUTIL_FLAGS="-package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib"
18+GACUTIL_FLAGS=-package $(ASSEMBLY_NAME)-sharp -root $(DESTDIR)$(prefix)/lib
19
20 references = $(GTK_SHARP_LIBS) -r\:$(abs_builddir)/../indicate/indicate-sharp.dll
21
22@@ -77,11 +77,11 @@
23 $(CSC) $(CSFLAGS) -keyfile:$(srcdir)/$(ASSEMBLY_NAME).snk -nowarn:0169,0612,0618 -unsafe -out:$(ASSEMBLY) -target:library $(references) $(builddir)/$(GENERATED_SOURCES) AssemblyInfo.cs
24
25 install-data-local:
26- echo "$(GACUTIL) -i $(ASSEMBLY) -package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib"; \
27- $(GACUTIL) -i $(ASSEMBLY) -package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib || exit 1;
28+ echo "$(GACUTIL) -i $(ASSEMBLY) $(GACUTIL_FLAGS)"; \
29+ $(GACUTIL) -i $(ASSEMBLY) $(GACUTIL_FLAGS) || exit 1;
30
31 uninstall-local:
32- echo "$(GACUTIL) -u $(ASSEMBLY_NAME)-sharp -package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib"; \
33- $(GACUTIL) -u $(ASSEMBLY_NAME)-sharp -package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib || exit 1;
34+ echo "$(GACUTIL) -u $(ASSEMBLY_NAME)-sharp $(GACUTIL_FLAGS)"; \
35+ $(GACUTIL) -u $(ASSEMBLY_NAME)-sharp $(GACUTIL_FLAGS) || exit 1;
36
37 all: $(API)
38
39=== modified file 'bindings/mono/indicate-gtk/indicate-gtk-sharp-0.1.pc.in'
40--- bindings/mono/indicate-gtk/indicate-gtk-sharp-0.1.pc.in 2010-09-09 20:00:04 +0000
41+++ bindings/mono/indicate-gtk/indicate-gtk-sharp-0.1.pc.in 2012-02-09 16:36:18 +0000
42@@ -1,7 +1,7 @@
43 prefix=@prefix@
44 exec_prefix=@exec_prefix@
45 libdir=@libdir@
46-assemblies_dir=${libdir}/indicate-gtk-sharp-0.1
47+assemblies_dir=${libdir}/mono/indicate-gtk-sharp
48
49 Name: indicate-gtk-sharp
50 Description: indicate-gtk for .NET
51
52=== modified file 'bindings/mono/indicate/Makefile.am'
53--- bindings/mono/indicate/Makefile.am 2010-12-08 23:00:50 +0000
54+++ bindings/mono/indicate/Makefile.am 2012-02-09 16:36:18 +0000
55@@ -11,7 +11,7 @@
56 METADATA = $(ASSEMBLY_NAME)-api.metadata
57 ASSEMBLY = $(ASSEMBLY_NAME)-sharp.dll
58 TARGET = $(ASSEMBLY) $(ASSEMBLY).config
59-assemblydir = $(libdir)/$(ASSEMBLY_NAME)-sharp-0.1
60+assemblydir = $(libdir)/mono/$(ASSEMBLY_NAME)-sharp
61 assembly_DATA = $(TARGET)
62 CLEANFILES = $(ASSEMBLY) \
63 $(ASSEMBLY).mdb \
64@@ -33,7 +33,7 @@
65 $(ASSEMBLY_NAME).snk \
66 $(customs)
67
68-GACUTIL_FLAGS="-package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib"
69+GACUTIL_FLAGS=-package $(ASSEMBLY_NAME)-sharp -root $(DESTDIR)$(prefix)/lib
70
71 references = $(GTK_SHARP_LIBS)
72
73@@ -78,11 +78,11 @@
74 $(CSC) $(CSFLAGS) -keyfile:$(srcdir)/$(ASSEMBLY_NAME).snk -nowarn:0169,0612,0618 -unsafe -out:$(ASSEMBLY) -target:library $(references) $(builddir)/$(GENERATED_SOURCES) AssemblyInfo.cs
75
76 install-data-local:
77- echo "$(GACUTIL) -i $(ASSEMBLY) -package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib"; \
78- $(GACUTIL) -i $(ASSEMBLY) -package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib || exit 1;
79+ echo "$(GACUTIL) -i $(ASSEMBLY) $(GACUTIL_FLAGS)"; \
80+ $(GACUTIL) -i $(ASSEMBLY) $(GACUTIL_FLAGS) || exit 1;
81
82 uninstall-local:
83- echo "$(GACUTIL) -u $(ASSEMBLY_NAME)-sharp -package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib"; \
84- $(GACUTIL) -u $(ASSEMBLY_NAME)-sharp -package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib || exit 1;
85+ echo "$(GACUTIL) -u $(ASSEMBLY_NAME)-sharp $(GACUTIL_FLAGS)"; \
86+ $(GACUTIL) -u $(ASSEMBLY_NAME)-sharp $(GACUTIL_FLAGS) || exit 1;
87
88 all: $(API)
89
90=== modified file 'bindings/mono/indicate/indicate-sharp-0.1.pc.in'
91--- bindings/mono/indicate/indicate-sharp-0.1.pc.in 2010-09-09 20:00:04 +0000
92+++ bindings/mono/indicate/indicate-sharp-0.1.pc.in 2012-02-09 16:36:18 +0000
93@@ -1,7 +1,7 @@
94 prefix=@prefix@
95 exec_prefix=@exec_prefix@
96 libdir=@libdir@
97-assemblies_dir=${libdir}/indicate-sharp-0.1
98+assemblies_dir=${libdir}/mono/indicate-sharp
99
100 Name: indicate-sharp
101 Description: indicate for .NET

Subscribers

People subscribed via source and target branches