$(datadir)/evolution/images instead of $(datadir)/images/evolution.

* 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.

svn path=/trunk/; revision=19295
This commit is contained in:
Ettore Perazzoli
2003-01-08 22:37:24 +00:00
parent 86033606aa
commit f4f3c71805
5 changed files with 30 additions and 22 deletions
+8
View File
@@ -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
+2 -2
View File
@@ -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
+1 -1
View File
@@ -52,7 +52,7 @@ evolutiondir = $(datadir)/evolution
evolution_DATA = arrow.png
iconsdir = $(datadir)/images/evolution
iconsdir = $(datadir)/evolution/images
gladedir = $(datadir)/evolution/glade
@@ -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
+18 -18
View File
@@ -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 = \