Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 370118 Thunderbird refuses to start: "Cannot find mozilla runtime directory. Exiting." r=philor

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@251665 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bugzilla%standard8.plus.com 2008-05-16 08:22:43 +00:00
parent 43f1a6056d
commit 7fbac6c2b7
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mozilla/mail/app/Makefile.in
View File

@ -312,8 +312,7 @@ endif
ifneq (,$(filter-out OS2 WINNT Darwin,$(OS_ARCH))) ifneq (,$(filter-out OS2 WINNT Darwin,$(OS_ARCH)))
thunderbird:: mozilla.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk thunderbird:: mozilla.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk
cat $< | sed -e "s|%MOZAPPDIR%|$(mozappdir)|" \ cat $< | sed -e "s|%MOZAPPDIR%|$(mozappdir)|" \
-e "s|%MREDIR%|$(mredir)|" \ -e "s|%MOZ_APP_DISPLAYNAME%|$(MOZ_APP_DISPLAYNAME)|" > $@
-e "s|%MOZILLA-BIN%|$(PROGRAM)|g" > $@
chmod +x $@ chmod +x $@
libs:: thunderbird libs:: thunderbird

10
mozilla/mail/app/mozilla.in
View File

@ -36,7 +36,7 @@
# #
# ***** END LICENSE BLOCK ***** # ***** 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: ## Usage:
## ##
@ -53,7 +53,6 @@
#set -x #set -x
moz_libdir=%MOZAPPDIR% moz_libdir=%MOZAPPDIR%
MRE_HOME=%MREDIR%
# Use run-mozilla.sh in the current dir if it exists # Use run-mozilla.sh in the current dir if it exists
# If not, then start resolving symlinks until we find run-mozilla.sh # If not, then start resolving symlinks until we find run-mozilla.sh
@ -80,6 +79,7 @@ else
if [ -x "$run_moz" ]; then if [ -x "$run_moz" ]; then
cd "$curdir" cd "$curdir"
dist_bin=`pwd` dist_bin=`pwd`
run_moz="$dist_bin/run-mozilla.sh"
found=1 found=1
break break
fi fi
@ -90,8 +90,8 @@ if [ $found = 0 ]; then
# Check default compile-time libdir # Check default compile-time libdir
if [ -x "$moz_libdir/run-mozilla.sh" ]; then if [ -x "$moz_libdir/run-mozilla.sh" ]; then
dist_bin="$moz_libdir" dist_bin="$moz_libdir"
else else
echo "Cannot find mozilla runtime directory. Exiting." echo "Cannot find %MOZ_APP_DISPLAYNAME% runtime directory. Exiting."
exit 1 exit 1
fi fi
fi fi
@ -131,8 +131,6 @@ do
esac esac
done done
export MRE_HOME
if [ $debugging = 1 ] if [ $debugging = 1 ]
then then
echo $dist_bin/run-mozilla.sh $script_args $dist_bin/$MOZILLA_BIN "$@" echo $dist_bin/run-mozilla.sh $script_args $dist_bin/$MOZILLA_BIN "$@"