Re: [evolution-patches] Patch to Update evolution-nognome for Solaris/Gnome2

[Rodney Dawes <dobey ximian com>]

Here is a revised patch that uses GNOME2_PATH instead of GNOME_PATH,
and moves the actual binary to libexecdir rather than renaming it to
evolution-bin-$(BASE_VERSION).

-- dobey

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/shell/ChangeLog,v
retrieving revision 1.1240
diff -u -r1.1240 ChangeLog
--- ChangeLog	16 Apr 2003 14:49:22 -0000	1.1240
+++ ChangeLog	16 Apr 2003 20:09:03 -0000
@@ -1,3 +1,8 @@
+2003-04-16  Rodney Dawes  <dobey ximian com>
+
+	* Makefile.am: Do magic for the evolution-nognome script for Solaris
+	* evolution-nognome.in: Update to reflect Sun Gnome2 paths and the magic
+	
 2003-04-16  Ettore Perazzoli  <ettore ximian com>
 
 	* apps_evolution_shell.schemas: Increase the default value for
Index: Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/shell/Makefile.am,v
retrieving revision 1.151
diff -u -r1.151 Makefile.am
--- Makefile.am	7 Apr 2003 16:08:11 -0000	1.151
+++ Makefile.am	16 Apr 2003 20:09:04 -0000
@@ -315,9 +315,21 @@
 		done														\
 	fi
 
-install-exec-local:
+install-evolution:
 	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) evolution $(DESTDIR)$(bindir)/evolution-$(BASE_VERSION)
 
+if HAVE_DTAPPINTEGRATE
+
+install-exec-local: install-evolution
+	mkdir -p $(DESTDIR)$(libexecdir)
+	mv $(DESTDIR)$(bindir)/evolution-$(BASE_VERSION) $(DESTDIR)$(libexecdir)/evolution-$(BASE_VERSION)
+	$(INSTALL_PROGRAM) evolution-nognome $(DESTDIR)$(bindir)/evolution-$(BASE_VERSION) 
+
+else
+
+install-exec-local: install-evolution
+
+endif
 
 # GLib marshalling cruft
 
@@ -366,9 +378,5 @@
 dist-hook:
 	cd $(distdir); rm -f $(BUILT_SOURCES)
 
+noinst_SCRIPTS = evolution-nognome
 
-if HAVE_DTAPPINTEGRATE
-
-bin_SCRIPTS = evolution-nognome
-
-endif
Index: evolution-nognome.in
===================================================================
RCS file: /cvs/gnome/evolution/shell/evolution-nognome.in,v
retrieving revision 1.2
diff -u -r1.2 evolution-nognome.in
--- evolution-nognome.in	16 Sep 2002 21:01:17 -0000	1.2
+++ evolution-nognome.in	16 Apr 2003 20:09:04 -0000
@@ -1,9 +1,9 @@
 #!/bin/sh
 
-PATH= prefix@/bin:@GNOME_PREFIX@/bin:${PATH}
-GNOME_PATH= prefix@:@GNOME_PREFIX@
-LD_LIBRARY_PATH= prefix@/lib:@GNOME_PREFIX@/lib:${LD_LIBRARY_PATH}
+PATH= prefix@/bin:/usr/gnome/bin:${PATH}
+GNOME2_PATH= prefix@:/usr/gnome
+LD_LIBRARY_PATH= prefix@/lib:/usr/gnome/lib:${LD_LIBRARY_PATH}
 
-export LD_LIBRARY_PATH GNOME_PATH PATH
+export LD_LIBRARY_PATH GNOME2_PATH PATH
 
-exec evolution
+exec @libexecdir@/evolution-1.3