From 9d14474e02c1064bc58f29376565a2446c99f99c Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Wed, 22 Jan 2003 20:25:15 +0000 Subject: Install the shell executable as evolution-$(BASE_VERSION) using an * Makefile.am: Install the shell executable as evolution-$(BASE_VERSION) using an install-exec-local hack. Also put libeshell in $(privlibdir) instead of $(libdir). (eshellincludedir): Version using $(BASE_VERSION). (INCLUDES): Update for the new locations of things. (etspecdir): Likewise. * e-shell-view.c (e_shell_view_construct): Get evolution.xml from EVOLUTION_UIDIR. * importer/Makefile.am: Install libevolution-importer in $(privlibdir) instead of $(libdir). (INCLUDES): Updated for the new versioned paths. Define EVOLUTION_UIDIR. (libevolution_importerincludedir): Version using $(BASE_VERSION). (gladedir): Likewise. * glade/Makefile.am (gladedir): Version using $(BASE_VERSION). * e-setup.c (DEFAULT_USER_PATH): New #define. (check_evolution_directory): Use it. (copy_default_stuff): Likewise. Also, remove old shortcuts.xml removal cruft. svn path=/trunk/; revision=19565 --- shell/e-shell-view.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'shell/e-shell-view.c') diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c index 426ceb0750..6ce2098eb8 100644 --- a/shell/e-shell-view.c +++ b/shell/e-shell-view.c @@ -1784,7 +1784,9 @@ e_shell_view_construct (EShellView *shell_view, bonobo_ui_component_freeze (priv->ui_component, NULL); - bonobo_ui_util_set_ui (priv->ui_component, EVOLUTION_DATADIR, "evolution.xml", "evolution", NULL); + bonobo_ui_util_set_ui (priv->ui_component, EVOLUTION_DATADIR, + EVOLUTION_UIDIR "/evolution.xml", + "evolution", NULL); setup_widgets (shell_view); -- cgit v1.2.3