diff options
| author | Miguel de Icaza <miguel@gnome.org> | 2006-11-20 01:28:05 +0300 |
|---|---|---|
| committer | Miguel de Icaza <miguel@gnome.org> | 2006-11-20 01:28:05 +0300 |
| commit | 0f6f27c7f1075b6758c90ef1f3b499d602957359 (patch) | |
| tree | 19055fbe9ec089ed34ee0e2edeebaa987578fc48 /docbrowser | |
| parent | 736fdb43184adc696c1924e5d0df55169d0d0900 (diff) | |
2006-11-19 Miguel de Icaza <miguel@novell.com>
* mondoc.in: Make this work with XulRunner, otherwise this crashes
with some crash inside AppendText inside Mozilla.
svn path=/trunk/mono-tools/; revision=68159
Diffstat (limited to 'docbrowser')
| -rw-r--r-- | docbrowser/monodoc.in | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/docbrowser/monodoc.in b/docbrowser/monodoc.in index 29f4ac03..3cea6868 100644 --- a/docbrowser/monodoc.in +++ b/docbrowser/monodoc.in @@ -62,11 +62,24 @@ case x$1 in ;; esac +getdirectory () { + w=`which $1` + if test -h $w; then + (cd `dirname $w`/`dirname \`readlink $w\``; pwd) + else + dirname $w + fi +} if test -n "$MOZILLA_FIVE_HOME"; then MOZILLA_HOME=$MOZILLA_FIVE_HOME -elif [ -f @MOZILLA_HOME@/chrome/comm.jar ]; then +elif test x@MOZILLA_HOME@ != x; then + if [ -f @MOZILLA_HOME@/chrome/comm.jar ]; then MOZILLA_HOME=@MOZILLA_HOME@ + fi +elif [ $(which xulrunner 2> /dev/null) ] > /dev/null ; then + MOZILLA_FIVE_HOME=`getdirectory xulrunner` + MOZILLA_HOME=$MOZILLA_FIVE_HOME elif [ $(which mozilla 2> /dev/null) ] && grep MOZILLA_FIVE_HOME= "$(which mozilla)" > /dev/null ; then MOZILLA_HOME=$(grep MOZILLA_FIVE_HOME= $(which mozilla) | cut -d '"' -f 2) elif [ $(which firefox 2> /dev/null) ] && grep MOZILLA_FIVE_HOME= "$(which firefox)" > /dev/null ; then @@ -78,6 +91,8 @@ if [ -n $LD_LIBRARY_PATH ]; then else export LD_LIBRARY_PATH=$MOZILLA_HOME fi - +export MOZILLA_FIVE_HOME +export MOZILLA_HOME +export LD_LIBRARY_PATH exec @RUNTIME@ $monodocdir/browser.exe $OPTIONS "$@" $REST |