[sylpheed:35467] [PATCH] Remove includedir from include path in Makefiles

[Valentine Barshak]

According to GNU coding standards, the includedir is the directory
for installing header files to be included by user programs.
There's no need to add it to the include path in Makefiles.
It's not only needless, but also breaks the cross-compilation
of the package, making it search for headers in the host
include directories.

For example, the OE recipe uses additional preconfigure script
to remove "-I$(includedir) from the Makefiles.
Let's remove it here instead.

Signed-off-by: Valentine Barshak <gvaxon at gmail.com>

diff -pruN sylpheed-3.3.0beta2.orig/libsylph/Makefile.am sylpheed-3.3.0beta2/libsylph/Makefile.am
--- sylpheed-3.3.0beta2.orig/libsylph/Makefile.am	2012-02-21 11:25:47.000000000 +0400
+++ sylpheed-3.3.0beta2/libsylph/Makefile.am	2012-10-08 13:38:04.099977171 +0400
@@ -4,7 +4,7 @@ AM_CPPFLAGS = \
 	-DSYSCONFDIR=\""$(sysconfdir)"\" \
 	-DLOCALEDIR=\""$(localedir)"\"
 
-INCLUDES = -I$(top_srcdir) $(GLIB_CFLAGS) -I$(includedir)
+INCLUDES = -I$(top_srcdir) $(GLIB_CFLAGS)
 
 lib_LTLIBRARIES = libsylph-0.la
 #noinst_LTLIBRARIES = libsylph.la
diff -pruN sylpheed-3.3.0beta2.orig/libsylph/Makefile.in sylpheed-3.3.0beta2/libsylph/Makefile.in
--- sylpheed-3.3.0beta2.orig/libsylph/Makefile.in	2012-09-27 12:58:47.000000000 +0400
+++ sylpheed-3.3.0beta2/libsylph/Makefile.in	2012-10-08 13:37:52.515976683 +0400
@@ -208,7 +208,7 @@ AM_CPPFLAGS = \
 	-DLOCALEDIR=\""$(localedir)"\"
 
 
-INCLUDES = -I$(top_srcdir) $(GLIB_CFLAGS) -I$(includedir)
+INCLUDES = -I$(top_srcdir) $(GLIB_CFLAGS)
 
 lib_LTLIBRARIES = libsylph-0.la
 
diff -pruN sylpheed-3.3.0beta2.orig/plugin/attachment_tool/Makefile.am sylpheed-3.3.0beta2/plugin/attachment_tool/Makefile.am
--- sylpheed-3.3.0beta2.orig/plugin/attachment_tool/Makefile.am	2012-02-21 11:27:43.000000000 +0400
+++ sylpheed-3.3.0beta2/plugin/attachment_tool/Makefile.am	2012-10-08 13:37:13.419974285 +0400
@@ -9,8 +9,7 @@ INCLUDES = \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/libsylph \
 	-I$(top_srcdir)/src \
-	$(GTK_CFLAGS) \
-	-I$(includedir)
+	$(GTK_CFLAGS)
 
 attachment_tool_la_LIBADD = \
 	$(GTK_LIBS) \
diff -pruN sylpheed-3.3.0beta2.orig/plugin/attachment_tool/Makefile.in sylpheed-3.3.0beta2/plugin/attachment_tool/Makefile.in
--- sylpheed-3.3.0beta2.orig/plugin/attachment_tool/Makefile.in	2012-09-27 12:58:48.000000000 +0400
+++ sylpheed-3.3.0beta2/plugin/attachment_tool/Makefile.in	2012-10-08 13:37:01.251973732 +0400
@@ -211,8 +211,7 @@ INCLUDES = \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/libsylph \
 	-I$(top_srcdir)/src \
-	$(GTK_CFLAGS) \
-	-I$(includedir)
+	$(GTK_CFLAGS)
 
 
 attachment_tool_la_LIBADD = \
diff -pruN sylpheed-3.3.0beta2.orig/plugin/test/Makefile.am sylpheed-3.3.0beta2/plugin/test/Makefile.am
--- sylpheed-3.3.0beta2.orig/plugin/test/Makefile.am	2012-02-21 11:27:21.000000000 +0400
+++ sylpheed-3.3.0beta2/plugin/test/Makefile.am	2012-10-08 13:37:38.275975664 +0400
@@ -9,8 +9,7 @@ INCLUDES = \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/libsylph \
 	-I$(top_srcdir)/src \
-	$(GTK_CFLAGS) \
-	-I$(includedir)
+	$(GTK_CFLAGS)
 
 test_la_LIBADD = \
 	$(GTK_LIBS) \
diff -pruN sylpheed-3.3.0beta2.orig/plugin/test/Makefile.in sylpheed-3.3.0beta2/plugin/test/Makefile.in
--- sylpheed-3.3.0beta2.orig/plugin/test/Makefile.in	2012-09-27 12:58:48.000000000 +0400
+++ sylpheed-3.3.0beta2/plugin/test/Makefile.in	2012-10-08 13:37:25.299975007 +0400
@@ -211,8 +211,7 @@ INCLUDES = \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/libsylph \
 	-I$(top_srcdir)/src \
-	$(GTK_CFLAGS) \
-	-I$(includedir)
+	$(GTK_CFLAGS)
 
 
 test_la_LIBADD = \
diff -pruN sylpheed-3.3.0beta2.orig/src/Makefile.am sylpheed-3.3.0beta2/src/Makefile.am
--- sylpheed-3.3.0beta2.orig/src/Makefile.am	2012-06-25 08:39:00.000000000 +0400
+++ sylpheed-3.3.0beta2/src/Makefile.am	2012-10-08 13:38:38.931978739 +0400
@@ -140,8 +140,7 @@ INCLUDES = \
 	-I$(top_srcdir)/libsylph \
 	$(GTK_CFLAGS) \
 	$(GDK_PIXBUF_CFLAGS) \
-	$(GPGME_CFLAGS) \
-	-I$(includedir)
+	$(GPGME_CFLAGS)
 
 if NATIVE_WIN32
 SYLPHEED_RES = sylpheed.res
diff -pruN sylpheed-3.3.0beta2.orig/src/Makefile.in sylpheed-3.3.0beta2/src/Makefile.in
--- sylpheed-3.3.0beta2.orig/src/Makefile.in	2012-09-27 12:58:48.000000000 +0400
+++ sylpheed-3.3.0beta2/src/Makefile.in	2012-10-08 13:38:21.036977928 +0400
@@ -348,8 +348,7 @@ INCLUDES = \
 	-I$(top_srcdir)/libsylph \
 	$(GTK_CFLAGS) \
 	$(GDK_PIXBUF_CFLAGS) \
-	$(GPGME_CFLAGS) \
-	-I$(includedir)
+	$(GPGME_CFLAGS)
 
 @NATIVE_WIN32_FALSE at SYLPHEED_RES =