Merge lp:~ballogy/libappindicator/build-fixes into lp:libappindicator

[Balló György]

This change contains some build fixes for the following problems:

1. Currently, the header files of GTK3 version of the library installed into /usr/include/libappindicator3-0.1 directory, but /usr/include/libappindicator-0.1 defined in appindicator3-0.1.pc.

2. Do not link pyglib explicitly, because the name of the pyglib library may differ between systems, and it seems that it builds without explicit linking.

3. Currently, mono files are installed into a non-standard /usr/lib/cli/appindicator-sharp-0.1 directory instead of /usr/lib/mono/appindicator-sharp. (Debian/Ubuntu should use a distro specific downstream patch.)

Unmerged revisions

=== modified file 'bindings/mono/Makefile.am'
--- bindings/mono/Makefile.am	2011-02-24 04:46:17 +0000
+++ bindings/mono/Makefile.am	2011-11-22 21:38:25 +0000
@@ -29,7 +29,7 @@
 	$(DLLPOLICY1) \
 	$(POLICY1).config
 
-assemblydir = $(libdir)/cli/appindicator-sharp-0.1
+assemblydir = $(libdir)/mono/appindicator-sharp
 assembly_DATA = $(TARGET)
 
 CLEANFILES = \
 
=== modified file 'bindings/mono/appindicator-sharp-0.1.pc.in'
--- bindings/mono/appindicator-sharp-0.1.pc.in	2010-05-23 10:44:53 +0000
+++ bindings/mono/appindicator-sharp-0.1.pc.in	2011-11-22 21:38:25 +0000
@@ -1,7 +1,7 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
-assemblies_dir=${libdir}/cli/appindicator-sharp-0.1
+assemblies_dir=${libdir}/mono/appindicator-sharp
 
 Name: appindicator-sharp
 Description: application indicators for .NET
 
=== modified file 'bindings/python/Makefile.am'
--- bindings/python/Makefile.am	2009-12-12 02:29:28 +0000
+++ bindings/python/Makefile.am	2011-11-22 21:38:25 +0000
@@ -19,7 +19,7 @@
 appindicatordir = $(pkgpyexecdir)/appindicator
 appindicator_LTLIBRARIES = _appindicator.la
 
-_appindicator_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_appindicator -lpyglib-2.0-python2.6
+_appindicator_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_appindicator
 _appindicator_la_LIBADD = $(APPINDICATOR_PYTHON_LIBS) -L$(top_builddir)/src/.libs -lappindicator
 _appindicator_la_SOURCES = appindicatormodule.c
 nodist__appindicator_la_SOURCES = appindicator.c
 
=== modified file 'src/appindicator3-0.1.pc.in'
--- src/appindicator3-0.1.pc.in	2011-03-01 04:34:45 +0000
+++ src/appindicator3-0.1.pc.in	2011-11-22 21:38:25 +0000
@@ -4,7 +4,7 @@
 bindir=@bindir@
 includedir=@includedir@
 
-Cflags: -I${includedir}/libappindicator-0.1
+Cflags: -I${includedir}/libappindicator3-0.1
 Requires: dbusmenu-glib-0.4 gtk+-3.0
 Libs: -L${libdir} -lappindicator3