From abb5fe7759fd95ca721177973bd2542d472d55f1 Mon Sep 17 00:00:00 2001
From: Rodney Dawes <dobey@ximian.com>
Date: Mon, 28 Apr 2003 21:21:00 +0000
Subject: Fix up some stuff for the nognome script Fix up nognome script for
 Sun

2003-04-28  Rodney Dawes  <dobey@ximian.com>

	* Makefile.am: Fix up some stuff for the nognome script
	* evolution-nognome.in: Fix up nognome script for Sun GNOME2

svn path=/trunk/; revision=20996
---
 shell/ChangeLog            |  5 +++++
 shell/Makefile.am          | 20 ++++++++++++++------
 shell/evolution-nognome.in | 14 +++++++++-----
 3 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/shell/ChangeLog b/shell/ChangeLog
index dc87f1ae0e..dd517ec0a9 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-28  Rodney Dawes  <dobey@ximian.com>
+
+	* Makefile.am: Fix up some stuff for the nognome script
+	* evolution-nognome.in: Fix up nognome script for Sun GNOME2
+	
 2003-04-28  Rodrigo Moya <rodrigo@ximian.com>
 
 	Fixes #41916
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 5fc76a57f5..d9b4a669ba 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -315,9 +315,21 @@ install-data-local:
 		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 @@ CLEANFILES = $(BUILT_SOURCES)
 dist-hook:
 	cd $(distdir); rm -f $(BUILT_SOURCES)
 
+noinst_SCRIPTS = evolution-nognome
 
-if HAVE_DTAPPINTEGRATE
-
-bin_SCRIPTS = evolution-nognome
-
-endif
diff --git a/shell/evolution-nognome.in b/shell/evolution-nognome.in
index 039eeb4b8c..bd6f15789b 100644
--- a/shell/evolution-nognome.in
+++ b/shell/evolution-nognome.in
@@ -1,9 +1,13 @@
 #!/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}
+prefix=@prefix@
+exec_prefix=@exec_prefix@
 
-export LD_LIBRARY_PATH GNOME_PATH 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 GNOME2_PATH PATH
+
+exec @libexecdir@/evolution-1.3 "$@"
 
-exec evolution
-- 
cgit v1.2.3