libindicate

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

  1. fix-mono-location
  2. Merge into trunk.0.7
Proposed by Ted Gould
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
bindings/mono/indicate-gtk/Makefile.am (+6/-6)
bindings/mono/indicate-gtk/indicate-gtk-sharp-0.1.pc.in (+1/-1)
bindings/mono/indicate/Makefile.am (+6/-6)
bindings/mono/indicate/indicate-sharp-0.1.pc.in (+1/-1)
To merge this branch: bzr merge lp:~ballogy/libindicate/fix-mono-location
Reviewer Review Type Date Requested Status
Charles Kerr (community) Needs Information
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.
Revision history for this message
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?

Reply
Revision history for this message
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.

Reply
Revision history for this message
Charles Kerr (charlesk) wrote :

ballogy: ping

review: Needs Information
Reply

Unmerged revisions

439. By Balló György

Fix mono bindings location

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'bindings/mono/indicate-gtk/Makefile.am'
--- bindings/mono/indicate-gtk/Makefile.am 2010-12-08 23:00:50 +0000
+++ bindings/mono/indicate-gtk/Makefile.am 2012-02-09 16:36:18 +0000
@@ -11,7 +11,7 @@
11METADATA = $(ASSEMBLY_NAME)-api.metadata11METADATA = $(ASSEMBLY_NAME)-api.metadata
12ASSEMBLY = $(ASSEMBLY_NAME)-sharp.dll12ASSEMBLY = $(ASSEMBLY_NAME)-sharp.dll
13TARGET = $(ASSEMBLY) $(ASSEMBLY).config13TARGET = $(ASSEMBLY) $(ASSEMBLY).config
14assemblydir = $(libdir)/$(ASSEMBLY_NAME)-sharp-0.114assemblydir = $(libdir)/mono/$(ASSEMBLY_NAME)-sharp
15assembly_DATA = $(TARGET)15assembly_DATA = $(TARGET)
16CLEANFILES = $(ASSEMBLY) \16CLEANFILES = $(ASSEMBLY) \
17 $(ASSEMBLY).mdb \17 $(ASSEMBLY).mdb \
@@ -32,7 +32,7 @@
32 $(ASSEMBLY_NAME).snk \32 $(ASSEMBLY_NAME).snk \
33 $(customs) 33 $(customs)
3434
35GACUTIL_FLAGS="-package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib"35GACUTIL_FLAGS=-package $(ASSEMBLY_NAME)-sharp -root $(DESTDIR)$(prefix)/lib
3636
37references = $(GTK_SHARP_LIBS) -r\:$(abs_builddir)/../indicate/indicate-sharp.dll37references = $(GTK_SHARP_LIBS) -r\:$(abs_builddir)/../indicate/indicate-sharp.dll
3838
@@ -77,11 +77,11 @@
77 $(CSC) $(CSFLAGS) -keyfile:$(srcdir)/$(ASSEMBLY_NAME).snk -nowarn:0169,0612,0618 -unsafe -out:$(ASSEMBLY) -target:library $(references) $(builddir)/$(GENERATED_SOURCES) AssemblyInfo.cs77 $(CSC) $(CSFLAGS) -keyfile:$(srcdir)/$(ASSEMBLY_NAME).snk -nowarn:0169,0612,0618 -unsafe -out:$(ASSEMBLY) -target:library $(references) $(builddir)/$(GENERATED_SOURCES) AssemblyInfo.cs
7878
79install-data-local:79install-data-local:
80 echo "$(GACUTIL) -i $(ASSEMBLY) -package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib"; \80 echo "$(GACUTIL) -i $(ASSEMBLY) $(GACUTIL_FLAGS)"; \
81 $(GACUTIL) -i $(ASSEMBLY) -package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib || exit 1;81 $(GACUTIL) -i $(ASSEMBLY) $(GACUTIL_FLAGS) || exit 1;
8282
83uninstall-local:83uninstall-local:
84 echo "$(GACUTIL) -u $(ASSEMBLY_NAME)-sharp -package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib"; \84 echo "$(GACUTIL) -u $(ASSEMBLY_NAME)-sharp $(GACUTIL_FLAGS)"; \
85 $(GACUTIL) -u $(ASSEMBLY_NAME)-sharp -package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib || exit 1;85 $(GACUTIL) -u $(ASSEMBLY_NAME)-sharp $(GACUTIL_FLAGS) || exit 1;
8686
87all: $(API)87all: $(API)
8888
=== modified file 'bindings/mono/indicate-gtk/indicate-gtk-sharp-0.1.pc.in'
--- bindings/mono/indicate-gtk/indicate-gtk-sharp-0.1.pc.in 2010-09-09 20:00:04 +0000
+++ bindings/mono/indicate-gtk/indicate-gtk-sharp-0.1.pc.in 2012-02-09 16:36:18 +0000
@@ -1,7 +1,7 @@
1prefix=@prefix@1prefix=@prefix@
2exec_prefix=@exec_prefix@2exec_prefix=@exec_prefix@
3libdir=@libdir@3libdir=@libdir@
4assemblies_dir=${libdir}/indicate-gtk-sharp-0.14assemblies_dir=${libdir}/mono/indicate-gtk-sharp
55
6Name: indicate-gtk-sharp6Name: indicate-gtk-sharp
7Description: indicate-gtk for .NET7Description: indicate-gtk for .NET
88
=== modified file 'bindings/mono/indicate/Makefile.am'
--- bindings/mono/indicate/Makefile.am 2010-12-08 23:00:50 +0000
+++ bindings/mono/indicate/Makefile.am 2012-02-09 16:36:18 +0000
@@ -11,7 +11,7 @@
11METADATA = $(ASSEMBLY_NAME)-api.metadata11METADATA = $(ASSEMBLY_NAME)-api.metadata
12ASSEMBLY = $(ASSEMBLY_NAME)-sharp.dll12ASSEMBLY = $(ASSEMBLY_NAME)-sharp.dll
13TARGET = $(ASSEMBLY) $(ASSEMBLY).config13TARGET = $(ASSEMBLY) $(ASSEMBLY).config
14assemblydir = $(libdir)/$(ASSEMBLY_NAME)-sharp-0.114assemblydir = $(libdir)/mono/$(ASSEMBLY_NAME)-sharp
15assembly_DATA = $(TARGET)15assembly_DATA = $(TARGET)
16CLEANFILES = $(ASSEMBLY) \16CLEANFILES = $(ASSEMBLY) \
17 $(ASSEMBLY).mdb \17 $(ASSEMBLY).mdb \
@@ -33,7 +33,7 @@
33 $(ASSEMBLY_NAME).snk \33 $(ASSEMBLY_NAME).snk \
34 $(customs) 34 $(customs)
3535
36GACUTIL_FLAGS="-package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib"36GACUTIL_FLAGS=-package $(ASSEMBLY_NAME)-sharp -root $(DESTDIR)$(prefix)/lib
3737
38references = $(GTK_SHARP_LIBS)38references = $(GTK_SHARP_LIBS)
3939
@@ -78,11 +78,11 @@
78 $(CSC) $(CSFLAGS) -keyfile:$(srcdir)/$(ASSEMBLY_NAME).snk -nowarn:0169,0612,0618 -unsafe -out:$(ASSEMBLY) -target:library $(references) $(builddir)/$(GENERATED_SOURCES) AssemblyInfo.cs78 $(CSC) $(CSFLAGS) -keyfile:$(srcdir)/$(ASSEMBLY_NAME).snk -nowarn:0169,0612,0618 -unsafe -out:$(ASSEMBLY) -target:library $(references) $(builddir)/$(GENERATED_SOURCES) AssemblyInfo.cs
7979
80install-data-local:80install-data-local:
81 echo "$(GACUTIL) -i $(ASSEMBLY) -package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib"; \81 echo "$(GACUTIL) -i $(ASSEMBLY) $(GACUTIL_FLAGS)"; \
82 $(GACUTIL) -i $(ASSEMBLY) -package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib || exit 1;82 $(GACUTIL) -i $(ASSEMBLY) $(GACUTIL_FLAGS) || exit 1;
8383
84uninstall-local:84uninstall-local:
85 echo "$(GACUTIL) -u $(ASSEMBLY_NAME)-sharp -package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib"; \85 echo "$(GACUTIL) -u $(ASSEMBLY_NAME)-sharp $(GACUTIL_FLAGS)"; \
86 $(GACUTIL) -u $(ASSEMBLY_NAME)-sharp -package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib || exit 1;86 $(GACUTIL) -u $(ASSEMBLY_NAME)-sharp $(GACUTIL_FLAGS) || exit 1;
8787
88all: $(API)88all: $(API)
8989
=== modified file 'bindings/mono/indicate/indicate-sharp-0.1.pc.in'
--- bindings/mono/indicate/indicate-sharp-0.1.pc.in 2010-09-09 20:00:04 +0000
+++ bindings/mono/indicate/indicate-sharp-0.1.pc.in 2012-02-09 16:36:18 +0000
@@ -1,7 +1,7 @@
1prefix=@prefix@1prefix=@prefix@
2exec_prefix=@exec_prefix@2exec_prefix=@exec_prefix@
3libdir=@libdir@3libdir=@libdir@
4assemblies_dir=${libdir}/indicate-sharp-0.14assemblies_dir=${libdir}/mono/indicate-sharp
55
6Name: indicate-sharp6Name: indicate-sharp
7Description: indicate for .NET7Description: indicate for .NET

Subscribers

People subscribed via source and target branches