[evolution-patches] Update nognome script
- From: Rodney Dawes <dobey ximian com>
- To: evolution-patches ximian com
- Subject: [evolution-patches] Update nognome script
- Date: 28 Apr 2003 08:30:12 -0400
Here's another patch to fix up the nognome script and only
install it on solaris, as a replacement for the actual evo
binary, which gets moved to libexecdir.
-- dobey
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 28 Apr 2003 12:25:53 -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 28 Apr 2003 12:25:53 -0000
@@ -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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]