diff options
| author | Ettore Perazzoli <ettore@src.gnome.org> | 2003-01-23 04:06:06 +0800 |
|---|---|---|
| committer | Ettore Perazzoli <ettore@src.gnome.org> | 2003-01-23 04:06:06 +0800 |
| commit | e8c9adced819e25b2b77314c773428c01a38643a (patch) | |
| tree | 1eee6ce45b29ea7613f083df14b1ace58ad5a242 /addressbook/gui/contact-list-editor | |
| parent | 05114bc4955e1f49386a210b863af4ac230dab6e (diff) | |
| download | gsoc2013-evolution-e8c9adced819e25b2b77314c773428c01a38643a.tar gsoc2013-evolution-e8c9adced819e25b2b77314c773428c01a38643a.tar.gz gsoc2013-evolution-e8c9adced819e25b2b77314c773428c01a38643a.tar.bz2 gsoc2013-evolution-e8c9adced819e25b2b77314c773428c01a38643a.tar.lz gsoc2013-evolution-e8c9adced819e25b2b77314c773428c01a38643a.tar.xz gsoc2013-evolution-e8c9adced819e25b2b77314c773428c01a38643a.tar.zst gsoc2013-evolution-e8c9adced819e25b2b77314c773428c01a38643a.zip | |
Version using $(BASE_VERSION). (etspecdir): Likewise. (iconsdir):
* gui/component/select-names/Makefile.am (gladedir): Version using
$(BASE_VERSION).
(etspecdir): Likewise.
(iconsdir): Likewise.
* gui/contact-list-editor/Makefile.am (iconsdir): Version using
$(BASE_VERSION).
(gladedir): Likewise.
* gui/merging/Makefile.am (gladedir): Version using $(BASE_VERSION).
* gui/search/Makefile.am (ruledir): Version using $(BASE_VERSION).
* gui/component/Makefile.am (INCLUDES): Update EVOLUTION_IMAGESDIR
to be versioned through $(BASE_VERSION).
* gui/widgets/e-addressbook-view.c (init_collection): Use
EVOLUTION_GALVIEWSDIR.
* gui/widgets/Makefile.am (INCLUDES): Define EVOLUTION_GALVIEWSDIR
and update EVOLUTION_IMAGESDIR.
svn path=/trunk/; revision=19551
Diffstat (limited to 'addressbook/gui/contact-list-editor')
| -rw-r--r-- | addressbook/gui/contact-list-editor/Makefile.am | 44 | ||||
| -rw-r--r-- | addressbook/gui/contact-list-editor/e-contact-list-editor.c | 2 |
2 files changed, 23 insertions, 23 deletions
diff --git a/addressbook/gui/contact-list-editor/Makefile.am b/addressbook/gui/contact-list-editor/Makefile.am index 7f13c401c7..1e88a2978b 100644 --- a/addressbook/gui/contact-list-editor/Makefile.am +++ b/addressbook/gui/contact-list-editor/Makefile.am @@ -1,22 +1,23 @@ -INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/addressbook/ \ - -I$(top_srcdir)/addressbook/backend \ - -I$(top_builddir)/addressbook/backend \ - -I$(top_srcdir)/addressbook/gui/merging \ +INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/addressbook/ \ + -I$(top_srcdir)/addressbook/backend \ + -I$(top_builddir)/addressbook/backend \ + -I$(top_srcdir)/addressbook/gui/merging \ -I$(top_srcdir)/addressbook/gui/contact-editor \ - -I$(top_builddir)/shell \ - -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ - -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"\ - -DDATADIR=\""$(datadir)"\" \ - -DEVOLUTION_DATADIR=\""$(datadir)"\" \ - -DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" \ - -DEVOLUTIONDIR=\""$(evolutiondir)"\" \ - -DG_LOG_DOMAIN=\"contact-list-editor\" \ - -DG_DISABLE_DEPRECATED \ - -DGTK_DISABLE_DEPRECATED \ - -DLIBGNOME_DISABLE_DEPRECATED \ - -DLIBGNOMEUI_DISABLE_DEPRECATED \ + -I$(top_builddir)/shell \ + -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ + -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \ + -DDATADIR=\""$(datadir)"\" \ + -DEVOLUTION_DATADIR=\""$(datadir)"\" \ + -DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" \ + -DEVOLUTION_UIDIR=\""$(evolutionuidir)"\" \ + -DEVOLUTIONDIR=\""$(evolutiondir)"\" \ + -DG_LOG_DOMAIN=\"contact-list-editor\" \ + -DG_DISABLE_DEPRECATED \ + -DGTK_DISABLE_DEPRECATED \ + -DLIBGNOME_DISABLE_DEPRECATED \ + -DLIBGNOMEUI_DISABLE_DEPRECATED \ $(EVOLUTION_ADDRESSBOOK_CFLAGS) noinst_LIBRARIES = \ @@ -44,14 +45,13 @@ 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)/evolution/images - -gladedir = $(datadir)/evolution/glade +iconsdir = $(datadir)/evolution-$(BASE_VERSION)/images +gladedir = $(datadir)/evolution-$(BASE_VERSION)/glade glade_DATA = \ contact-list-editor.glade -etspecdir = $(datadir)/evolution/etspec +etspecdir = $(datadir)/evolution-$(BASE_VERSION)/etspec etspec_DATA = e-contact-list-editor.etspec BUILT_SOURCES = $(MARSHAL_GENERATED) diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.c b/addressbook/gui/contact-list-editor/e-contact-list-editor.c index 36ccfe13d1..cb6cbc4213 100644 --- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c +++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.c @@ -559,7 +559,7 @@ create_ui (EContactListEditor *ce) ce->uic, verbs, ce); bonobo_ui_util_set_ui (ce->uic, EVOLUTION_DATADIR, - "evolution-contact-list-editor.xml", + EVOLUTION_UIDIR "/evolution-contact-list-editor.xml", "evolution-contact-list-editor", NULL); e_pixmaps_update (ce->uic, pixmaps); |