ayatana-commits team mailing list archive

[György Balló <ballogyor@xxxxxxxxx>]

György Balló has proposed merging lp:~ballogy/libindicate/fix-mono-location into lp:libindicate.

Requested reviews:
  Indicator Applet Developers (indicator-applet-developers)

For more details, see:
https://code.launchpad.net/~ballogy/libindicate/fix-mono-location/+merge/83095

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.
-- 
https://code.launchpad.net/~ballogy/libindicate/fix-mono-location/+merge/83095
Your team ayatana-commits is subscribed to branch lp:libindicate.

=== 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	2011-11-23 00:32:26 +0000
@@ -11,7 +11,7 @@
 METADATA = $(ASSEMBLY_NAME)-api.metadata
 ASSEMBLY = $(ASSEMBLY_NAME)-sharp.dll
 TARGET = $(ASSEMBLY) $(ASSEMBLY).config
-assemblydir = $(libdir)/$(ASSEMBLY_NAME)-sharp-0.1
+assemblydir = $(libdir)/mono/$(ASSEMBLY_NAME)-sharp
 assembly_DATA = $(TARGET)
 CLEANFILES =	$(ASSEMBLY)			\
 		$(ASSEMBLY).mdb			\
@@ -32,7 +32,7 @@
 	$(ASSEMBLY_NAME).snk			\
 	$(customs)				
 
-GACUTIL_FLAGS="-package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib"
+GACUTIL_FLAGS=-package $(ASSEMBLY_NAME)-sharp -root $(DESTDIR)$(prefix)/lib
 
 references = $(GTK_SHARP_LIBS) -r\:$(abs_builddir)/../indicate/indicate-sharp.dll
 
@@ -77,11 +77,11 @@
 	$(CSC) $(CSFLAGS) -keyfile:$(srcdir)/$(ASSEMBLY_NAME).snk -nowarn:0169,0612,0618 -unsafe -out:$(ASSEMBLY) -target:library $(references) $(builddir)/$(GENERATED_SOURCES) AssemblyInfo.cs
 
 install-data-local:
-	echo "$(GACUTIL) -i $(ASSEMBLY)  -package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib";  \
-            $(GACUTIL) -i $(ASSEMBLY)  -package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib || exit 1;
+	echo "$(GACUTIL) -i $(ASSEMBLY) $(GACUTIL_FLAGS)";  \
+            $(GACUTIL) -i $(ASSEMBLY) $(GACUTIL_FLAGS) || exit 1;
 
 uninstall-local:
-	echo "$(GACUTIL) -u $(ASSEMBLY_NAME)-sharp -package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib"; \
-            $(GACUTIL) -u $(ASSEMBLY_NAME)-sharp -package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib || exit 1;
+	echo "$(GACUTIL) -u $(ASSEMBLY_NAME)-sharp $(GACUTIL_FLAGS)"; \
+            $(GACUTIL) -u $(ASSEMBLY_NAME)-sharp $(GACUTIL_FLAGS) || exit 1;
 
 all: $(API)

=== 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	2011-11-23 00:32:26 +0000
@@ -1,7 +1,7 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
-assemblies_dir=${libdir}/indicate-gtk-sharp-0.1
+assemblies_dir=${libdir}/mono/indicate-gtk-sharp
 
 Name: indicate-gtk-sharp
 Description: indicate-gtk for .NET

=== modified file 'bindings/mono/indicate/Makefile.am'
--- bindings/mono/indicate/Makefile.am	2010-12-08 23:00:50 +0000
+++ bindings/mono/indicate/Makefile.am	2011-11-23 00:32:26 +0000
@@ -11,7 +11,7 @@
 METADATA = $(ASSEMBLY_NAME)-api.metadata
 ASSEMBLY = $(ASSEMBLY_NAME)-sharp.dll
 TARGET = $(ASSEMBLY) $(ASSEMBLY).config
-assemblydir = $(libdir)/$(ASSEMBLY_NAME)-sharp-0.1
+assemblydir = $(libdir)/mono/$(ASSEMBLY_NAME)-sharp
 assembly_DATA = $(TARGET)
 CLEANFILES =	$(ASSEMBLY)			\
 		$(ASSEMBLY).mdb			\
@@ -33,7 +33,7 @@
 	$(ASSEMBLY_NAME).snk			\
 	$(customs)				
 
-GACUTIL_FLAGS="-package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib"
+GACUTIL_FLAGS=-package $(ASSEMBLY_NAME)-sharp -root $(DESTDIR)$(prefix)/lib
 
 references = $(GTK_SHARP_LIBS)
 
@@ -78,11 +78,11 @@
 	$(CSC) $(CSFLAGS) -keyfile:$(srcdir)/$(ASSEMBLY_NAME).snk -nowarn:0169,0612,0618 -unsafe -out:$(ASSEMBLY) -target:library $(references) $(builddir)/$(GENERATED_SOURCES) AssemblyInfo.cs
 
 install-data-local:
-	echo "$(GACUTIL) -i $(ASSEMBLY)  -package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib";  \
-            $(GACUTIL) -i $(ASSEMBLY)  -package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib || exit 1;
+	echo "$(GACUTIL) -i $(ASSEMBLY) $(GACUTIL_FLAGS)";  \
+            $(GACUTIL) -i $(ASSEMBLY) $(GACUTIL_FLAGS) || exit 1;
 
 uninstall-local:
-	echo "$(GACUTIL) -u $(ASSEMBLY_NAME)-sharp -package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib"; \
-            $(GACUTIL) -u $(ASSEMBLY_NAME)-sharp -package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib || exit 1;
+	echo "$(GACUTIL) -u $(ASSEMBLY_NAME)-sharp $(GACUTIL_FLAGS)"; \
+            $(GACUTIL) -u $(ASSEMBLY_NAME)-sharp $(GACUTIL_FLAGS) || exit 1;
 
 all: $(API)

=== 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	2011-11-23 00:32:26 +0000
@@ -1,7 +1,7 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
-assemblies_dir=${libdir}/indicate-sharp-0.1
+assemblies_dir=${libdir}/mono/indicate-sharp
 
 Name: indicate-sharp
 Description: indicate for .NET