[anjal] BUGFIX: GNOME Bug #592294 - Use pkgconfig for EVOLUTION228_PRIVDATADIR

[Yan Li <yanli src gnome org>]

commit 88ea7f358767034e2ddf24306dcd8c52499b2552
Author: Yan Li <yanli infradead org>
Date:   Wed Nov 11 17:18:51 2009 +0800

    BUGFIX: GNOME Bug #592294 - Use pkgconfig for EVOLUTION228_PRIVDATADIR
    
    Evolution's datadir may be different from the datadir of Anjal. We
    should not use Anjal's datadir to access Evolution's data
    files. Instead, we should use pkg-config.

 configure.ac    |    2 ++
 src/Makefile.am |    4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 4491c4f..3e4f163 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,6 +29,8 @@ AC_SUBST(imagesdir)
 evolutioncomponentdir=`pkg-config --variable=componentdir evolution-shell`
 AC_SUBST(evolutioncomponentdir)
 
+evolutiondatadir=`pkg-config --variable=datadir evolution-shell`
+AC_SUBST(evolutiondatadir)
 
 dnl ***************************************************************************
 dnl Internatinalization
diff --git a/src/Makefile.am b/src/Makefile.am
index daa7f98..72dec27 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,8 +5,8 @@ AM_CPPFLAGS = \
 	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
 	-DPACKAGE_SRC_DIR=\""$(srcdir)"\" \
 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-	-DEVOLUTION226_PRIVDATADIR=\""$(datadir)/evolution/2.26/"\" \
-	-DEVOLUTION228_PRIVDATADIR=\""$(datadir)/evolution/2.28/"\" \
+	-DEVOLUTION226_PRIVDATADIR=\""$(evolutiondatadir)/evolution/2.26/"\" \
+	-DEVOLUTION228_PRIVDATADIR=\""$(evolutiondatadir)/evolution/2.28/"\" \
 	-DANJAL_IMAGEDIR=\""$(datadir)/anjal/images/"\" \
 	$(ANJAL_CFLAGS)	-I. \
 	$(MOZILLA_CFLAGS) \