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

7 files changed, 78 insertions, 66 deletions

diff --git a/shell/ChangeLog b/shell/ChangeLog
index f8f2db01c9..b09fab1e06 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,29 @@
+2003-01-22  Ettore Perazzoli  <ettore@ximian.com>
+
+	* 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.
+
 2003-01-17  Chris Toshok  <toshok@ximian.com>
 
 	* e-shell-settings-dialog.c (set_dialog_size): pass
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 19b83e9b26..14538d0557 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -1,24 +1,27 @@
 SUBDIRS = glade importer
 
-INCLUDES =							\
-	-DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED		\
-	-I$(top_srcdir)/widgets					\
-	-I$(top_srcdir)/widgets/misc				\
-	-I$(top_srcdir)/libical/src/libical			\
-	-I$(top_builddir)/libical/src/libical			\
-	-I$(top_srcdir)						\
-	-DEVOLUTION_IMAGES=\""$(datadir)/evolution/images"\"	\
-	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"   		\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"            	\
-	-DEVOLUTION_GLADEDIR=\"$(datadir)/evolution/glade\"	\
-	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"		\
-	-DPREFIX=\"$(prefix)\"					\
-	-DSYSCONFDIR=\""$(sysconfdir)"\" 			\
-	-DDATADIR=\""$(datadir)"\"	 			\
-	-DLIBDIR=\""$(datadir)"\"	 			\
-	-DG_LOG_DOMAIN=\"evolution-shell\"			\
+INCLUDES =									\
+	-DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED				\
+	-I$(top_srcdir)/widgets							\
+	-I$(top_srcdir)/widgets/misc						\
+	-I$(top_srcdir)/libical/src/libical					\
+	-I$(top_builddir)/libical/src/libical					\
+	-I$(top_srcdir)								\
+	-DEVOLUTION_IMAGES=\""$(datadir)/evolution-$(BASE_VERSION)/images"\"	\
+	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"				\
+	-DEVOLUTION_DATADIR=\""$(datadir)"\"					\
+	-DEVOLUTION_GLADEDIR=\"$(datadir)/evolution-$(BASE_VERSION)/glade\"	\
+	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"				\
+	-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\"				\
+	-DPREFIX=\"$(prefix)\"							\
+	-DSYSCONFDIR=\""$(sysconfdir)"\"					\
+	-DDATADIR=\""$(datadir)"\"						\
+	-DLIBDIR=\""$(datadir)"\"						\
+	-DG_LOG_DOMAIN=\"evolution-shell\"					\
 	$(SHELL_CFLAGS)
 
+noinst_PROGRAMS = evolution evolution-test-component
+
 # Shell CORBA stuff
 
 IDLS = \
@@ -68,10 +71,10 @@ idl_DATA = $(IDLS)
 
 # Shell library
 
-lib_LTLIBRARIES =	\
+privlib_LTLIBRARIES =	\
 	libeshell.la
 
-eshellincludedir = $(includedir)/evolution/shell
+eshellincludedir = $(includedir)/evolution-$(BASE_VERSION)/shell
 
 eshellinclude_HEADERS = 			\
 	Evolution.h				\
@@ -119,8 +122,6 @@ libeshell_la_SOURCES = 				\
 
 # Evolution executable
 
-bin_PROGRAMS = evolution
-
 evolution_SOURCES =				\
 	$(SELECT_NAMES_IDL_GENERATED)		\
 	e-activity-handler.c			\
@@ -235,9 +236,6 @@ evolution_LDFLAGS = -export-dynamic
 
 # Test component
 
-noinst_PROGRAMS =			\
-	evolution-test-component
-
 evolution_test_component_SOURCES =	\
 	evolution-test-component.c
 
@@ -246,7 +244,6 @@ evolution_test_component_LDADD = 	\
 	$(SHELL_LIBS)
 
 install-test-component: evolution-test-component
-	$(mkinstalldirs) $(DESTDIR)$(bindir)
 	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) evolution-test-component $(DESTDIR)$(bindir)/evolution-test-component
 	$(mkinstalldirs) $(DESTDIR)$(serverdir)
 	$(INSTALL_DATA) $(srcdir)/GNOME_Evolution_TestComponent.server $(DESTDIR)$(serverdir)/GNOME_Evolution_TestComponent.server
@@ -259,9 +256,8 @@ server_DATA = $(server_in_files:.server.in.in=.server)
 $(server_in_files:.server.in.in=.server.in): $(server_in_files)
 	sed -e "s|\@BINDIR\@|$(bindir)|" $< > $@
 
-etspecdir = $(datadir)/evolution/etspec/
-etspec_DATA = \
-	e-storage-set-view.etspec
+etspecdir = $(datadir)/evolution-$(BASE_VERSION)/etspec/
+etspec_DATA = e-storage-set-view.etspec
 
 @INTLTOOL_SERVER_RULE@
 
@@ -276,12 +272,15 @@ schemadir   = $(GCONF_SCHEMA_FILE_DIR)
 schema_DATA = apps_evolution_shell.schemas
 
 install-data-local:
-	if test -z "$(DESTDIR)" ; then \
-		for p in $(schema_DATA) ; do \
-			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p; \
-		done \
+	if test -z "$(DESTDIR)" ; then												\
+		for p in $(schema_DATA) ; do											\
+			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p;	\
+		done														\
 	fi
 
+install-exec-local:
+	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) evolution $(DESTDIR)$(bindir)/evolution-$(BASE_VERSION)
+
 
 # GLib marshalling cruft
 
diff --git a/shell/e-setup.c b/shell/e-setup.c
index d7d19a9c37..ecd0ab5b0e 100644
--- a/shell/e-setup.c
+++ b/shell/e-setup.c
@@ -51,6 +51,8 @@
 #include <string.h>
 #include <unistd.h>
 
+#define DEFAULT_USER_PATH  EVOLUTION_DATADIR "/evolution-" BASE_VERSION "/default_user"
+
 
 static GList *
 check_dir_recur (const char *evolution_directory,
@@ -116,12 +118,9 @@ check_evolution_directory (const char *evolution_directory)
 	GtkWidget *label1, *label2;
 	gboolean retval;
 	GList *newfiles, *l;
-	char *defaultdir;
 	int result;
 
-	defaultdir = g_strdup (EVOLUTION_DATADIR "/evolution/default_user");
-	newfiles = g_list_concat (NULL, check_dir_recur (evolution_directory,
-							 defaultdir));
+	newfiles = g_list_concat (NULL, check_dir_recur (evolution_directory, DEFAULT_USER_PATH));
 
 	if (newfiles == NULL) {
 		retval = TRUE;
@@ -155,7 +154,7 @@ check_evolution_directory (const char *evolution_directory)
 		char *command;
 		char *shortpath;
 
-		shortpath = l->data + strlen (EVOLUTION_DATADIR "/evolution/default_user/");
+		shortpath = l->data + strlen (DEFAULT_USER_PATH);
 		command = g_strconcat ("cp -r ",
 				       l->data, " ",
 				       evolution_directory, "/",
@@ -181,7 +180,6 @@ check_evolution_directory (const char *evolution_directory)
 		g_free (l->data);
 
 	g_list_free (newfiles);
-	g_free (defaultdir);
 
 	return retval;
 }
@@ -192,7 +190,6 @@ copy_default_stuff (const char *evolution_directory)
 {
 	gboolean retval;
 	char *command;
-	char *old_default_shortcuts_file;
 
 	if (mkdir (evolution_directory, 0700)) {
 		e_notice (NULL, GTK_MESSAGE_ERROR,
@@ -202,11 +199,7 @@ copy_default_stuff (const char *evolution_directory)
 		return FALSE;
 	}
 
-	command = g_strconcat ("cp -r ",
-			       EVOLUTION_DATADIR,
-			       "/evolution/default_user/* ",
-			       evolution_directory,
-			       NULL);
+	command = g_strconcat ("cp -r " DEFAULT_USER_PATH " ", evolution_directory, NULL);
 
 	if (system (command) != 0) {
 		/* FIXME: Give more help.  */
@@ -217,14 +210,6 @@ copy_default_stuff (const char *evolution_directory)
 		retval = TRUE;
 	}
 
-	/* Temporary block of code to keep it from using the older
-           shortcuts.xml that exists for current users in
-           $GNOME/share/evolution/default_user.  Remove this by 1.0 */
-	old_default_shortcuts_file = g_concat_dir_and_file (evolution_directory,
-							    "shortcuts.xml");
-	unlink (old_default_shortcuts_file);
-	g_free (old_default_shortcuts_file);
-	
 	g_free (command);
 
 	return retval;
diff --git a/shell/e-shell-settings-dialog.c b/shell/e-shell-settings-dialog.c
index eeadd88885..fab3acf684 100644
--- a/shell/e-shell-settings-dialog.c
+++ b/shell/e-shell-settings-dialog.c
@@ -68,8 +68,8 @@ set_dialog_size (EShellSettingsDialog *dialog)
 					     gtk_widget_get_style (GTK_WIDGET (dialog))->font_desc,
 					     pango_context_get_language (context));
 
-	pango_layout_get_pixel_size (layout,
-				     &width, NULL);
+	pango_layout_get_pixel_size (layout, &width, NULL);
+
 	width *= 72;
 	height = PANGO_PIXELS (pango_font_metrics_get_ascent (metrics)
 			       + pango_font_metrics_get_descent (metrics)) * 35;
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);
 
diff --git a/shell/glade/Makefile.am b/shell/glade/Makefile.am
index a7e1ac69d3..d1dcff6046 100644
--- a/shell/glade/Makefile.am
+++ b/shell/glade/Makefile.am
@@ -1,4 +1,4 @@
-gladedir = $(datadir)/evolution/glade
+gladedir = $(datadir)/evolution-$(BASE_VERSION)/glade
 
 glade_DATA =						\
 	e-active-connection-dialog.glade		\
diff --git a/shell/importer/Makefile.am b/shell/importer/Makefile.am
index 6084f4577d..d0fff6253e 100644
--- a/shell/importer/Makefile.am
+++ b/shell/importer/Makefile.am
@@ -1,13 +1,13 @@
-INCLUDES =							\
-	-I$(top_srcdir)						\
-	-I$(top_srcdir)/shell					\
-	-I$(top_builddir)/shell					\
-	-I$(includedir)						\
-	-DG_LOG_DOMAIN=\"Evolution-Importer\" 			\
-	-DEVOLUTION_GLADEDIR=\"$(datadir)/evolution/glade\" 	\
+INCLUDES =									\
+	-I$(top_srcdir)								\
+	-I$(top_srcdir)/shell							\
+	-I$(top_builddir)/shell							\
+	-I$(includedir)								\
+	-DG_LOG_DOMAIN=\"Evolution-Importer\"					\
+	-DEVOLUTION_GLADEDIR=\"$(datadir)/evolution-$(BASE_VERSION)/glade\"	\
 	$(SHELL_CFLAGS)
 
-lib_LTLIBRARIES = libevolution-importer.la
+privlib_LTLIBRARIES = libevolution-importer.la
 
 IDLS = GNOME_Evolution_Importer.idl
 
@@ -25,7 +25,7 @@ $(IDL_GENERATED): $(IDLS)
 
 idl_DATA = $(IDLS)
 
-libevolution_importerincludedir = $(includedir)/evolution/importer
+libevolution_importerincludedir = $(includedir)/evolution-$(BASE_VERSION)/importer
 libevolution_importer_la_SOURCES = 		\
 	$(IDL_GENERATED)			\
 	evolution-intelligent-importer.c	\
@@ -46,7 +46,7 @@ libevolution_importer_la_LIBADD =		\
 	$(top_builddir)/e-util/libeutil.la 	\
 	$(SHELL_LIBS)
 
-gladedir = $(datadir)/evolution/glade
+gladedir = $(datadir)/evolution-$(BASE_VERSION)/glade
 glade_DATA = import.glade
 
 EXTRA_DIST = $(glade_DATA) $(IDLS)