2006-03-08 [colin] 2.0.0cvs122

	* src/plugins/trayicon/Makefile.am
		Fix build in separate dir
		Patch by Bamanzi <bamanzi@gmail.com>

diff --git a/ChangeLog b/ChangeLog
index 9f1380ca1aba8b370f8ad50ef809ca852e63bea1..45ce4a108951e456e1fca34fba2e70c914bb8367 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-03-08 [colin]     2.0.0cvs122
+
+       * src/plugins/trayicon/Makefile.am
+               Fix build in separate dir 
+               Patch by Bamanzi <bamanzi@gmail.com>
+

 2006-03-08 [colin]     2.0.0cvs121
 
        * src/procmsg.c
 2006-03-08 [colin]     2.0.0cvs121
 
        * src/procmsg.c

diff --git a/PATCHSETS b/PATCHSETS
index e066733925295f6da79de97ba2d72b539c53c400..b627e386dd8f9911a35bb245d0f80fedc9af2408 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1305,3 +1305,4 @@
 ( cvs diff -u -r 1.213.2.84 -r 1.213.2.85 src/folder.c;  cvs diff -u -r 1.87.2.25 -r 1.87.2.26 src/folder.h;  cvs diff -u -r 1.207.2.89 -r 1.207.2.90 src/folderview.c;  ) > 2.0.0cvs119.patchset
 ( cvs diff -u -r 1.36.2.57 -r 1.36.2.58 src/common/utils.c;  ) > 2.0.0cvs120.patchset
 ( cvs diff -u -r 1.150.2.56 -r 1.150.2.57 src/procmsg.c;  ) > 2.0.0cvs121.patchset
 ( cvs diff -u -r 1.213.2.84 -r 1.213.2.85 src/folder.c;  cvs diff -u -r 1.87.2.25 -r 1.87.2.26 src/folder.h;  cvs diff -u -r 1.207.2.89 -r 1.207.2.90 src/folderview.c;  ) > 2.0.0cvs119.patchset
 ( cvs diff -u -r 1.36.2.57 -r 1.36.2.58 src/common/utils.c;  ) > 2.0.0cvs120.patchset
 ( cvs diff -u -r 1.150.2.56 -r 1.150.2.57 src/procmsg.c;  ) > 2.0.0cvs121.patchset

+( cvs diff -u -r 1.4.2.4 -r 1.4.2.5 src/plugins/trayicon/Makefile.am;  ) > 2.0.0cvs122.patchset

diff --git a/configure.ac b/configure.ac
index 0d32d305e1844f2bfc95624f3419aea9c55ee894..34c621c64223f24c900d8795bb0d9f8a2114b887 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=121
+EXTRA_VERSION=122

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/plugins/trayicon/Makefile.am b/src/plugins/trayicon/Makefile.am
index 8959c9ed1d1f118f9d661e7422b0394a78390031..772634a5b95e37afb15becb13006ac7d9488410e 100644 (file)
--- a/src/plugins/trayicon/Makefile.am
+++ b/src/plugins/trayicon/Makefile.am
@@ -25,7 +25,7 @@ INCLUDES = \
        -I$(top_srcdir)/src \
        -I$(top_srcdir)/src/common \
        -I$(top_srcdir)/src/gtk \
        -I$(top_srcdir)/src \
        -I$(top_srcdir)/src/common \
        -I$(top_srcdir)/src/gtk \

-       -Ilibeggtrayicon
+       -I$(srcdir)libeggtrayicon

 
 AM_CPPFLAGS = \
        $(GLIB_CFLAGS) \
 
 AM_CPPFLAGS = \
        $(GLIB_CFLAGS) \