[Monodevelop-patches-list] r1409 - trunk/MonoDevelop

[commit-watcher at mono-cvs.ximian.com]

Author: jluke
Date: 2004-04-07 13:57:36 -0400 (Wed, 07 Apr 2004)
New Revision: 1409

Modified:
   trunk/MonoDevelop/ChangeLog
   trunk/MonoDevelop/monodevelop.in
Log:
conditionally set LD_LIBRARY_PATH


Modified: trunk/MonoDevelop/ChangeLog
===================================================================
--- trunk/MonoDevelop/ChangeLog	2004-04-07 13:54:59 UTC (rev 1408)
+++ trunk/MonoDevelop/ChangeLog	2004-04-07 17:57:36 UTC (rev 1409)
@@ -1,3 +1,8 @@
+2004-04-07  John Luke  <jluke at cfl.rr.com>
+	
+	* monodevelop.in: conditionally set LD_LIBRARY_PATH based on advice from
+	http://www.gnome.org/~markmc/blog/07042004
+
 2004-04-02  Todd Berman  <tberman at sevenl.net>
 
 	* Gui/CompletionDatabaseWizard/DownloadGenerator.cs:

Modified: trunk/MonoDevelop/monodevelop.in
===================================================================
--- trunk/MonoDevelop/monodevelop.in	2004-04-07 13:54:59 UTC (rev 1408)
+++ trunk/MonoDevelop/monodevelop.in	2004-04-07 17:57:36 UTC (rev 1409)
@@ -13,12 +13,14 @@
  
 MD_BIN_PATH=@prefix@/lib/monodevelop/bin
 
-LD_LIBRARY_PATH=$MOZILLA_HOME:$MD_BIN_PATH:$LD_LIBRARY_PATH
-export LD_LIBRARY_PATH
- 
-MOZILLA_FIVE_HOME=$MOZILLA_HOME
-export MOZILLA_FIVE_HOME
+if [ -n $LD_LIBRARY_PATH ]; then
+	export LD_LIBRARY_PATH=$MOZILLA_HOME:$MD_BIN_PATH:$LD_LIBRARY_PATH
+else
+	export LD_LIBRARY_PATH=$MOZILLA_HOME:$MD_BIN_PATH
+fi
 
+export MOZILLA_FIVE_HOME=$MOZILLA_HOME
+
 cd $MD_BIN_PATH
 
 case x$1 in