diff options
| -rw-r--r-- | config_host.mk.in | 1 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | instsetoo_native/util/openoffice.lst.in | 1 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/windows/directory.pm | 4 |
4 files changed, 6 insertions, 2 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index ac811c991a05..e8d0ec4851c0 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -609,6 +609,7 @@ export WINDOWS_SDK_HOME=@WINDOWS_SDK_HOME@ export WINDOWS_SDK_LIB_SUBDIR=@WINDOWS_SDK_LIB_SUBDIR@ export WINDOWS_SDK_VERSION=@WINDOWS_SDK_VERSION@ export WINDOWS_SDK_WILANGID=@WINDOWS_SDK_WILANGID@ +export WINDOWS_X64=@WINDOWS_X64@ export WINDRES=@WINDRES@ export WINEGCC=@WINEGCC@ export WITH_COMPAT_OOWRAPPERS=@WITH_COMPAT_OOWRAPPERS@ diff --git a/configure.ac b/configure.ac index 7156e8f1b8ce..1cecb38fb350 100644 --- a/configure.ac +++ b/configure.ac @@ -3947,6 +3947,7 @@ cygwin*) CPUNAME=X86_64 RTL_ARCH=X86_64 PLATFORMID=windows_x86_64 + WINDOWS_X64=1 else CPUNAME=INTEL RTL_ARCH=x86 @@ -4359,6 +4360,7 @@ AC_SUBST(OS) AC_SUBST(P_SEP) AC_SUBST(WORKDIR) AC_SUBST(PLATFORMID) +AC_SUBST(WINDOWS_X64) AC_DEFINE_UNQUOTED(WORKDIR,"$WORKDIR") dnl =================================================================== diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in index d2b3bff95be5..77f566da55b9 100644 --- a/instsetoo_native/util/openoffice.lst.in +++ b/instsetoo_native/util/openoffice.lst.in @@ -33,6 +33,7 @@ Globals OOOVENDOR The Document Foundation OOODOWNLOADNAME 1 STARTCENTER_HIDE_EXTERNAL_LINKS 0 + 64BITPRODUCT @WINDOWS_X64@ } } } diff --git a/solenv/bin/modules/installer/windows/directory.pm b/solenv/bin/modules/installer/windows/directory.pm index b84b05a4bcc8..a1d677393334 100644 --- a/solenv/bin/modules/installer/windows/directory.pm +++ b/solenv/bin/modules/installer/windows/directory.pm @@ -62,9 +62,9 @@ sub overwrite_programfilesfolder { my ( $allvariables ) = @_; - if ( $allvariables->{'PROGRAMFILESFOLDERNAME'} ) + if (( $allvariables->{'64BITPRODUCT'} ) && ( $allvariables->{'64BITPRODUCT'} == 1 )) { - $installer::globals::programfilesfolder = $allvariables->{'PROGRAMFILESFOLDERNAME'}; + $installer::globals::programfilesfolder = "ProgramFiles64Folder"; } } |