Follow up to bug 701875 - Fix red on windows fennec builds by always defining the omnijar name, r=bustage

This commit is contained in:
Michael Wu 2011-11-13 11:31:48 -08:00
Родитель 5e5bc845fc
Коммит 4eb59457c9
1 изменённых файлов: 2 добавлений и 2 удалений

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

@ -7656,8 +7656,6 @@ dnl done during packaging with omnijar.
if test "$MOZ_CHROME_FILE_FORMAT" = "omni"; then
MOZ_OMNIJAR=1
AC_DEFINE(MOZ_OMNIJAR)
OMNIJAR_NAME=omni.ja
AC_SUBST(OMNIJAR_NAME)
if test "$OS_ARCH" = "WINNT" -o "$OS_ARCH" = "OS2" -o "$OS_TARGET" = "Android"; then
MOZ_CHROME_FILE_FORMAT=flat
else
@ -7667,6 +7665,8 @@ elif test "$MOZ_CHROME_FILE_FORMAT" = "jar"; then
AC_DEFINE(MOZ_CHROME_FILE_FORMAT_JAR)
fi
OMNIJAR_NAME=omni.ja
AC_SUBST(OMNIJAR_NAME)
AC_SUBST(MOZ_OMNIJAR)
dnl ========================================================