Back out Bug #273977 to fix the mac bustage

This commit is contained in:
scott%scott-macgregor.org 2006-07-07 16:26:16 +00:00
Родитель cbcde2bab2
Коммит 7b9ea402d1
2 изменённых файлов: 2 добавлений и 6 удалений

Просмотреть файл

@ -58,12 +58,8 @@ PREF_JS_EXPORTS = \
ifeq ($(USE_SHORT_LIBNAME), 1)
PROGRAM = thunderbird$(BIN_SUFFIX)
else
ifeq ($(OS_ARCH),Darwin)
PROGRAM = $(MOZ_APP_DISPLAYNAME)
else
PROGRAM = thunderbird-bin$(BIN_SUFFIX)
endif
endif
REQUIRES = \
xpcom \
@ -313,7 +309,7 @@ libs:: $(PROGRAM)
rsync -a --exclude CVS --exclude "*.in" $(srcdir)/macbuild/Contents $(DIST)/$(APP_NAME).app --exclude English.lproj
mkdir -p $(DIST)/$(APP_NAME).app/Contents/Resources/$(AB).lproj
rsync -a --exclude CVS $(srcdir)/macbuild/Contents/Resources/English.lproj/ $(DIST)/$(APP_NAME).app/Contents/Resources/$(AB).lproj
sed -e "s/APP_VERSION/$(APP_VERSION)/" -e "s/MOZ_APP_DISPLAYNAME/$(MOZ_APP_DISPLAYNAME)/" $(srcdir)/macbuild/Contents/Info.plist.in > $(DIST)/$(APP_NAME).app/Contents/Info.plist
sed -e "s/APP_VERSION/$(APP_VERSION)/" $(srcdir)/macbuild/Contents/Info.plist.in > $(DIST)/$(APP_NAME).app/Contents/Info.plist
rsync -a $(DIST)/bin/ $(DIST)/$(APP_NAME).app/Contents/MacOS
rm -f $(DIST)/$(APP_NAME).app/Contents/MacOS/$(PROGRAM)
rsync -aL $(PROGRAM) $(DIST)/$(APP_NAME).app/Contents/MacOS

Просмотреть файл

@ -5,7 +5,7 @@
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
<string>MOZ_APP_DISPLAYNAME</string>
<string>thunderbird-bin</string>
<key>CFBundleGetInfoString</key>
<string>Thunderbird APP_VERSION, © 1998-2006 Contributors</string>
<key>CFBundleIconFile</key>