From aebea90f7f457e3897b3e512f885b29728c7a7b8 Mon Sep 17 00:00:00 2001
From: Andrew Shadura <andrewsh@debian.org>
Date: Mon, 14 Dec 2015 21:11:35 +0100
Subject: Apply patches.

---
 Makefile.am                   | 2 ++
 appindicator3-sharp-0.1.pc.in | 5 ++++-
 configure.ac                  | 4 ++--
 sources/Makefile.am           | 2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index e6e403f..26fbd26 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,5 @@
+ACLOCAL_AMFLAGS = -I m4
+
 SUBDIRS = sources sources/glue doc
 
 pkgconfigdir = $(libdir)/pkgconfig
diff --git a/appindicator3-sharp-0.1.pc.in b/appindicator3-sharp-0.1.pc.in
index c2dd575..ef8bf69 100644
--- a/appindicator3-sharp-0.1.pc.in
+++ b/appindicator3-sharp-0.1.pc.in
@@ -1,9 +1,12 @@
 prefix=@prefix@
 exec_prefix=${prefix}
 libdir=@libdir@
+pkglibdir=${exec_prefix}/lib/cli/@ASSEMBLY_PC@
+gapidir=${exec_prefix}/share/gapi-3.0
 
 Name: @ASSEMBLY_TITLE@
 Description: @ASSEMBLY_DESCRIPTION@
 Version: @VERSION@
 Requires: 
-Libs: -r:${libdir}/mono/@ASSEMBLY_NAME@/@ASSEMBLY_NAME@.dll
+Libs: -r:${pkglibdir}/@ASSEMBLY_NAME@.dll
+Cflags: -I:${gapidir}/@ASSEMBLY_NAME@-api.xml
diff --git a/configure.ac b/configure.ac
index 1edd14f..4a21364 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@ ASSEMBLY_PC="appindicator3-sharp-0.1"
 ASSEMBLY_SHORTNAME="appindicator3"
 ASSEMBLY_TITLE="AppIndicator3#"
 ASSEMBLY_VERSION="12.10.0"
-AC_SUBST([ACLOCAL_AMFLAGS], ["-I m4 \${ACLOCAL_FLAGS}"])
+AC_CONFIG_MACRO_DIR([m4])
 
 AC_SUBST(ASSEMBLY_NAME)
 AC_SUBST(ASSEMBLY_VERSION)
@@ -39,7 +39,7 @@ PKG_CHECK_MODULES(MONO_DEPENDENCY, mono >= 1.0, has_mono=true, has_mono=false)
 
 if test "x$has_mono" = "xtrue"; then
 1	AC_PATH_PROG(RUNTIME, mono, no)
-	AC_PATH_PROG(CSC, gmcs, no)
+	AC_PATH_PROG(CSC, mcs, no)
 	LIB_PREFIX=.so
 	LIB_SUFFIX=
 else
diff --git a/sources/Makefile.am b/sources/Makefile.am
index 2881239..9f6dcc2 100644
--- a/sources/Makefile.am
+++ b/sources/Makefile.am
@@ -42,7 +42,7 @@ generated-stamp: $(API)
 
 $(DLL): $(build_sources) generated-stamp
 	$(CSC) -nowarn:169 -unsafe -target:library $(GTK_SHARP_LIBS) \
-		$(build_sources)  generated/*.cs -out:$(DLL)
+		$(build_sources)  generated/*/*.cs -out:$(DLL)
 
 install-data-local:
 	echo "$(GACUTIL) /i $(DLL) /f $(GACUTIL_FLAGS)";  \
-- 
cgit v1.2.3