Bug 1030016 - Port |Bug 598615 - HAVE_64BIT_OS changed to HAVE_64BIT_BUILD| to SeaMonkey. r=jcranmer on a CLOSED TREE
This commit is contained in:
Родитель
d6349d32d1
Коммит
ca18a2e424
|
@ -123,7 +123,7 @@ if test -n "$COMPILE_ENVIRONMENT" -a -n "$MOZ_LDAP_XPCOM"; then
|
|||
fi
|
||||
|
||||
ac_configure_args="$_SUBDIR_CONFIG_ARGS --prefix=$MOZ_BUILD_ROOT/dist --with-dist-prefix=$MOZ_BUILD_ROOT/dist --without-nss --with-mozilla"
|
||||
if test -n "$HAVE_64BIT_OS"; then
|
||||
if test -n "$HAVE_64BIT_BUILD"; then
|
||||
dnl A 64-bit OS was (auto-)detected: (explicitly) enable 64-bit support.
|
||||
ac_configure_args="$ac_configure_args --enable-64bit"
|
||||
fi
|
||||
|
|
|
@ -21,8 +21,8 @@
|
|||
|
||||
# ARCH is used when it is necessary to differentiate the x64 registry keys from
|
||||
# the x86 registry keys (e.g. the uninstall registry key).
|
||||
#ifdef HAVE_64BIT_OS
|
||||
!define HAVE_64BIT_OS
|
||||
#ifdef HAVE_64BIT_BUILD
|
||||
!define HAVE_64BIT_BUILD
|
||||
!define ARCH "x64"
|
||||
!define MinSupportedVer "Microsoft Windows Vista x64"
|
||||
#else
|
||||
|
|
|
@ -103,7 +103,7 @@ VIAddVersionKey "OriginalFilename" "setup.exe"
|
|||
|
||||
Name "${BrandFullName}"
|
||||
OutFile "setup.exe"
|
||||
!ifdef HAVE_64BIT_OS
|
||||
!ifdef HAVE_64BIT_BUILD
|
||||
InstallDir "$PROGRAMFILES64\${BrandFullName}\"
|
||||
!else
|
||||
InstallDir "$PROGRAMFILES32\${BrandFullName}\"
|
||||
|
|
|
@ -115,7 +115,7 @@ VIAddVersionKey "OriginalFilename" "helper.exe"
|
|||
|
||||
Name "${BrandFullName}"
|
||||
OutFile "helper.exe"
|
||||
!ifdef HAVE_64BIT_OS
|
||||
!ifdef HAVE_64BIT_BUILD
|
||||
InstallDir "$PROGRAMFILES64\${BrandFullName}\"
|
||||
!else
|
||||
InstallDir "$PROGRAMFILES32\${BrandFullName}\"
|
||||
|
|
Загрузка…
Ссылка в новой задаче