[evolution-patches] evolution -> evolution-1.3 symlink

[Ettore Perazzoli <ettore ximian com>]

This patch makes the Makefile in shell/ install a symlink from
"evolution" to "evolution-$(BASE_VERSION)".  It can be disabled by
passing --disable-default-binary to configure.

-- Ettore

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/ChangeLog,v
retrieving revision 1.1198
diff -u -p -r1.1198 ChangeLog
--- ChangeLog	16 May 2003 18:10:42 -0000	1.1198
+++ ChangeLog	18 May 2003 22:29:08 -0000
@@ -1,3 +1,9 @@
+2003-05-18  Ettore Perazzoli  <ettore ximian com>
+
+	* configure.in: Remove GNOME_PREFIX stuff.  Add
+	--disable-default-binary command line option, with corresponding
+	DEFAULT_BINARY Automake conditional.
+
 2003-04-30  Ettore Perazzoli  <ettore ximian com>
 
 	* configure.in: Bump version number to 1.3.3.99.
Index: configure.in
===================================================================
RCS file: /cvs/gnome/evolution/configure.in,v
retrieving revision 1.581
diff -u -p -r1.581 configure.in
--- configure.in	16 May 2003 18:10:44 -0000	1.581
+++ configure.in	18 May 2003 22:29:13 -0000
@@ -947,15 +947,6 @@ else
 	AC_DEFINE_UNQUOTED([KILL_PROCESS_CMD], "$KILL_PROCESS_CMD", [Command to kill processes by name])
 fi
 
-dnl ****************************************************
-dnl GNOME_PREFIX is is needed by shell/evolution-nognome
-dnl ****************************************************
-dnl
-dnl FIXME this doesn't work with GNOME 2.
-
-GNOME_PREFIX="`gnome-config --prefix`"
-AC_SUBST(GNOME_PREFIX)
-
 dnl ******************************
 dnl OpenSSL
 dnl ******************************
@@ -1254,6 +1245,10 @@ dnl Sub-version number
 dnl ******************
 AC_ARG_WITH(sub-version, [  --with-sub-version=VERSION Specify a sub-version string])
 AC_DEFINE_UNQUOTED(SUB_VERSION, "$with_sub_version", [Version substring, for packagers])
+
+AC_ARG_ENABLE(default-binary, [  --disable-default-binary Do not install as the default "evolution" binary  ], , enable_default_binary=yes)
+AM_CONDITIONAL(DEFAULT_BINARY, test x$enable_default_binary = xyes)
+
 
 dnl ********************
 dnl KDE applnk directory
Index: shell/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/shell/Makefile.am,v
retrieving revision 1.153
diff -u -p -r1.153 Makefile.am
--- shell/Makefile.am	29 Apr 2003 20:24:24 -0000	1.153
+++ shell/Makefile.am	18 May 2003 22:29:13 -0000
@@ -318,6 +318,9 @@ install-data-local:
 install-evolution:
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
 	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) evolution $(DESTDIR)$(bindir)/evolution-$(BASE_VERSION)
+if DEFAULT_BINARY
+	cd $(DESTDIR)$(bindir) && rm -f evolution && $(LN_S) evolution-$(BASE_VERSION) evolution
+endif
 
 if HAVE_DTAPPINTEGRATE
 
@@ -331,6 +334,7 @@ else
 install-exec-local: install-evolution
 
 endif
+
 
 # GLib marshalling cruft
 
Index: shell/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/shell/ChangeLog,v
retrieving revision 1.1276
diff -u -p -r1.1276 ChangeLog
--- shell/ChangeLog	18 May 2003 00:48:03 -0000	1.1276
+++ shell/ChangeLog	18 May 2003 22:29:47 -0000
@@ -1,3 +1,16 @@
+2003-05-18  Ettore Perazzoli  <ettore ximian com>
+
+	* Makefile.am (install-evolution) [DEFAULT_BINARY]: Make a
+	symbolic link from evolution to evolution-$(BASE_VERSION).
+
+2003-05-17  Ettore Perazzoli  <ettore ximian com>
+
+	[#43216]
+
+	* e-shell-folder-creation-dialog.c (dialog_data_destroy):
+	g_object_weak_unref shell and dialog if they are not NULL.
+	(dialog_destroy_notify): Set ->dialog to NULL in all cases.
+
 2003-05-17  Ettore Perazzoli  <ettore ximian com>
 
 	* e-storage-set-view.c (e_storage_set_view_set_show_checkboxes):