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

3 files changed, 36 insertions, 35 deletions

diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am
index 16eb925fe3..b1f585db7a 100644
--- a/addressbook/gui/component/Makefile.am
+++ b/addressbook/gui/component/Makefile.am
@@ -1,34 +1,35 @@
 SUBDIRS	= select-names
 
-INCLUDES =							\
-	-DG_LOG_DOMAIN=\"evolution-addressbook\"		\
-	-DPREFIX=\"$(prefix)\"					\
-	-DSYSCONFDIR=\"$(sysconfdir)\"				\
-	-DDATADIR=\"$(datadir)\"				\
-	-DLIBDIR=\"$(libdir)\"					\
-	-I$(top_srcdir)						\
-	-I$(top_builddir)					\
-	-I$(top_srcdir)/shell					\
-	-I$(top_builddir)/shell					\
-	-I$(top_srcdir)/widgets/misc				\
-	-I$(top_srcdir)/addressbook/gui/contact-editor		\
-	-I$(top_srcdir)/addressbook/gui/contact-list-editor	\
-	-I$(top_srcdir)/addressbook/gui/minicard		\
-	-I$(top_srcdir)/addressbook/gui/widgets			\
-	-I$(top_srcdir)/addressbook/backend			\
-	-I$(top_builddir)/addressbook/backend			\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"			\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"			\
-	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"		\
-	-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"			\
-	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"		\
-	-DCAMEL_PROVIDERDIR=\""$(providerdir)"\"		\
-	-DEVOLUTION_IMAGESDIR=\""$(datadir)"/evolution/images\" \
-	$(LDAP_CFLAGS)						\
-	-DG_DISABLE_DEPRECATED					\
-	-DGTK_DISABLE_DEPRECATED				\
-	-DLIBGNOME_DISABLE_DEPRECATED				\
-	-DLIBGNOMEUI_DISABLE_DEPRECATED				\
+INCLUDES =									\
+	-DG_LOG_DOMAIN=\"evolution-addressbook\"				\
+	-DPREFIX=\"$(prefix)\"							\
+	-DSYSCONFDIR=\"$(sysconfdir)\"						\
+	-DDATADIR=\"$(datadir)\"						\
+	-DLIBDIR=\"$(libdir)\"							\
+	-I$(top_srcdir)								\
+	-I$(top_builddir)							\
+	-I$(top_srcdir)/shell							\
+	-I$(top_builddir)/shell							\
+	-I$(top_srcdir)/widgets/misc						\
+	-I$(top_srcdir)/addressbook/gui/contact-editor				\
+	-I$(top_srcdir)/addressbook/gui/contact-list-editor			\
+	-I$(top_srcdir)/addressbook/gui/minicard				\
+	-I$(top_srcdir)/addressbook/gui/widgets					\
+	-I$(top_srcdir)/addressbook/backend					\
+	-I$(top_builddir)/addressbook/backend					\
+	-DEVOLUTION_DATADIR=\""$(datadir)"\"					\
+	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"					\
+	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"				\
+	-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"					\
+	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"				\
+	-DCAMEL_PROVIDERDIR=\""$(providerdir)"\"				\
+	-DEVOLUTION_IMAGESDIR=\""$(datadir)"/evolution-$(BASE_VERSION)/images\"	\
+	-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\"				\
+	$(LDAP_CFLAGS)								\
+	-DG_DISABLE_DEPRECATED							\
+	-DGTK_DISABLE_DEPRECATED						\
+	-DLIBGNOME_DISABLE_DEPRECATED						\
+	-DLIBGNOMEUI_DISABLE_DEPRECATED						\
 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
 
 componentdir = $(COMPONENT_DIR)
@@ -95,10 +96,10 @@ $(server_in_files:.server.in.in=.server.in): $(server_in_files)
 
 @INTLTOOL_SERVER_RULE@
 
-gladedir   = $(datadir)/evolution/glade
+gladedir   = $(datadir)/evolution-$(BASE_VERSION)/glade
 glade_DATA = ldap-config.glade
 
-iconsdir = $(datadir)/evolution/images
+iconsdir = $(datadir)/evolution-$(BASE_VERSION)/images
 
 EXTRA_DIST =			\
 	$(glade_DATA)		\
diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c
index 2c2001c4c6..9ab5d87320 100644
--- a/addressbook/gui/component/addressbook.c
+++ b/addressbook/gui/component/addressbook.c
@@ -376,7 +376,7 @@ control_activate (BonoboControl     *control,
 	bonobo_ui_component_freeze (uic, NULL);
 
 	bonobo_ui_util_set_ui (uic, EVOLUTION_DATADIR,
-			       "evolution-addressbook.xml",
+			       EVOLUTION_UIDIR "/evolution-addressbook.xml",
 			       "evolution-addressbook", NULL);
 
 	e_addressbook_view_setup_menus (view->view, uic);
diff --git a/addressbook/gui/component/select-names/Makefile.am b/addressbook/gui/component/select-names/Makefile.am
index 5972f3f4db..87510bf90d 100644
--- a/addressbook/gui/component/select-names/Makefile.am
+++ b/addressbook/gui/component/select-names/Makefile.am
@@ -50,7 +50,7 @@ INCLUDES =						\
 	-DLIBGNOMEUI_DISABLE_DEPRECATED			\
 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
 
-lib_LTLIBRARIES = libeselectnames.la
+privlib_LTLIBRARIES = libeselectnames.la
 
 libeselectnames_la_SOURCES = 			\
 	$(IDL_GENERATED)			\
@@ -94,10 +94,10 @@ e-select-names-marshal.c: e-select-names-marshal.h
 
 MARSHAL_GENERATED = e-select-names-marshal.c e-select-names-marshal.h
 
-gladedir   = $(datadir)/evolution/glade
+gladedir   = $(datadir)/evolution-$(BASE_VERSION)/glade
 glade_DATA = select-names.glade
 
-etspecdir   = $(datadir)/evolution/etspec
+etspecdir   = $(datadir)/evolution-$(BASE_VERSION)/etspec
 etspec_DATA = e-select-names.etspec
 
 EXTRA_DIST = 			\