aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--addressbook/ChangeLog8
-rw-r--r--addressbook/gui/component/Makefile.am4
-rw-r--r--addressbook/gui/contact-editor/Makefile.am2
-rw-r--r--addressbook/gui/contact-list-editor/Makefile.am2
-rw-r--r--addressbook/gui/widgets/Makefile.am36
5 files changed, 30 insertions, 22 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 87b410baf2..2b4911b194 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,11 @@
+2003-01-08 Ettore Perazzoli <ettore@ximian.com>
+
+ * gui/component/Makefile.am: $(datadir)/evolution/images instead
+ of $(datadir)/images/evolution.
+ * gui/contact-editor/Makefile.am: Likewise.
+ * gui/contact-list-editor/Makefile.am (iconsdir): Likewise.
+ * gui/widgets/Makefile.am: Likewise.
+
2002-01-08 Dan Winship <danw@ximian.com>
Move PASBook request handling into PASBackend itself since all
diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am
index f9e9863713..7aa28859b4 100644
--- a/addressbook/gui/component/Makefile.am
+++ b/addressbook/gui/component/Makefile.am
@@ -23,7 +23,7 @@ INCLUDES = \
-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" \
-DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \
-DCAMEL_PROVIDERDIR=\""$(providerdir)"\" \
- -DEVOLUTION_IMAGESDIR=\""$(datadir)"/images/evolution\" \
+ -DEVOLUTION_IMAGESDIR=\""$(datadir)"/evolution/images\" \
$(LDAP_CFLAGS) \
-DG_DISABLE_DEPRECATED \
-DGTK_DISABLE_DEPRECATED \
@@ -98,7 +98,7 @@ $(server_in_files:.server.in.in=.server.in): $(server_in_files)
gladedir = $(datadir)/evolution/glade
glade_DATA = ldap-config.glade
-iconsdir = $(datadir)/images/evolution
+iconsdir = $(datadir)/evolution/images
etspecdir = $(datadir)/evolution/etspec
etspec_DATA = addressbook-config.etspec
diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am
index 308972b207..62583207a3 100644
--- a/addressbook/gui/contact-editor/Makefile.am
+++ b/addressbook/gui/contact-editor/Makefile.am
@@ -52,7 +52,7 @@ evolutiondir = $(datadir)/evolution
evolution_DATA = arrow.png
-iconsdir = $(datadir)/images/evolution
+iconsdir = $(datadir)/evolution/images
gladedir = $(datadir)/evolution/glade
diff --git a/addressbook/gui/contact-list-editor/Makefile.am b/addressbook/gui/contact-list-editor/Makefile.am
index 3822d8f551..7f13c401c7 100644
--- a/addressbook/gui/contact-list-editor/Makefile.am
+++ b/addressbook/gui/contact-list-editor/Makefile.am
@@ -44,7 +44,7 @@ e-contact-list-editor-marshal.c: e-contact-list-editor-marshal.h
MARSHAL_GENERATED = e-contact-list-editor-marshal.c e-contact-list-editor-marshal.h
-iconsdir = $(datadir)/images/evolution
+iconsdir = $(datadir)/evolution/images
gladedir = $(datadir)/evolution/glade
diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am
index a2fd2b24f2..3335593fca 100644
--- a/addressbook/gui/widgets/Makefile.am
+++ b/addressbook/gui/widgets/Makefile.am
@@ -1,21 +1,21 @@
-INCLUDES = \
- -DG_LOG_DOMAIN=\"e-minicard\" \
- -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
- -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \
- -DEVOLUTION_DATADIR=\""$(datadir)"\" \
- -DEVOLUTION_IMAGESDIR=\""$(datadir)"/images/evolution\" \
- -I$(top_srcdir) \
- -I$(top_srcdir)/addressbook/backend \
- -I$(top_builddir)/addressbook/backend \
- -I$(top_srcdir)/addressbook/gui/contact-editor \
- -I$(top_srcdir)/addressbook/gui/merging \
- -I$(top_srcdir)/addressbook/gui/component \
- -I$(top_srcdir)/widgets/misc \
- -I$(top_builddir)/shell \
- -DG_DISABLE_DEPRECATED \
- -DGTK_DISABLE_DEPRECATED \
- -DLIBGNOME_DISABLE_DEPRECATED \
- -DLIBGNOMEUI_DISABLE_DEPRECATED \
+INCLUDES = \
+ -DG_LOG_DOMAIN=\"e-minicard\" \
+ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
+ -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \
+ -DEVOLUTION_DATADIR=\""$(datadir)"\" \
+ -DEVOLUTION_IMAGESDIR=\""$(datadir)"/evolution/images\" \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/addressbook/backend \
+ -I$(top_builddir)/addressbook/backend \
+ -I$(top_srcdir)/addressbook/gui/contact-editor \
+ -I$(top_srcdir)/addressbook/gui/merging \
+ -I$(top_srcdir)/addressbook/gui/component \
+ -I$(top_srcdir)/widgets/misc \
+ -I$(top_builddir)/shell \
+ -DG_DISABLE_DEPRECATED \
+ -DGTK_DISABLE_DEPRECATED \
+ -DLIBGNOME_DISABLE_DEPRECATED \
+ -DLIBGNOMEUI_DISABLE_DEPRECATED \
$(EVOLUTION_ADDRESSBOOK_CFLAGS)
noinst_LIBRARIES = \