Bug 370118 Thunderbird refuses to start: "Cannot find mozilla runtime directory. Exiting." r=philor
git-svn-id: svn://10.0.0.236/trunk@251665 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
43f1a6056d
commit
7fbac6c2b7
@ -312,8 +312,7 @@ endif
|
||||
ifneq (,$(filter-out OS2 WINNT Darwin,$(OS_ARCH)))
|
||||
thunderbird:: mozilla.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk
|
||||
cat $< | sed -e "s|%MOZAPPDIR%|$(mozappdir)|" \
|
||||
-e "s|%MREDIR%|$(mredir)|" \
|
||||
-e "s|%MOZILLA-BIN%|$(PROGRAM)|g" > $@
|
||||
-e "s|%MOZ_APP_DISPLAYNAME%|$(MOZ_APP_DISPLAYNAME)|" > $@
|
||||
chmod +x $@
|
||||
|
||||
libs:: thunderbird
|
||||
|
||||
@ -36,7 +36,7 @@
|
||||
#
|
||||
# ***** END LICENSE BLOCK *****
|
||||
|
||||
## $Id: mozilla.in,v 1.8 2008-01-07 23:17:04 reed%reedloden.com Exp $
|
||||
## $Id: mozilla.in,v 1.9 2008-05-16 08:22:43 bugzilla%standard8.plus.com Exp $
|
||||
##
|
||||
## Usage:
|
||||
##
|
||||
@ -53,7 +53,6 @@
|
||||
#set -x
|
||||
|
||||
moz_libdir=%MOZAPPDIR%
|
||||
MRE_HOME=%MREDIR%
|
||||
|
||||
# Use run-mozilla.sh in the current dir if it exists
|
||||
# If not, then start resolving symlinks until we find run-mozilla.sh
|
||||
@ -80,6 +79,7 @@ else
|
||||
if [ -x "$run_moz" ]; then
|
||||
cd "$curdir"
|
||||
dist_bin=`pwd`
|
||||
run_moz="$dist_bin/run-mozilla.sh"
|
||||
found=1
|
||||
break
|
||||
fi
|
||||
@ -90,8 +90,8 @@ if [ $found = 0 ]; then
|
||||
# Check default compile-time libdir
|
||||
if [ -x "$moz_libdir/run-mozilla.sh" ]; then
|
||||
dist_bin="$moz_libdir"
|
||||
else
|
||||
echo "Cannot find mozilla runtime directory. Exiting."
|
||||
else
|
||||
echo "Cannot find %MOZ_APP_DISPLAYNAME% runtime directory. Exiting."
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
@ -131,8 +131,6 @@ do
|
||||
esac
|
||||
done
|
||||
|
||||
export MRE_HOME
|
||||
|
||||
if [ $debugging = 1 ]
|
||||
then
|
||||
echo $dist_bin/run-mozilla.sh $script_args $dist_bin/$MOZILLA_BIN "$@"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user