INTEGRATION: CWS native188_DEV300 (1.5.36.1.6); FILE MERGED

2008/08/25 09:07:39 is 1.5.36.1.6.1: #i93065# patch for expand.exe in cygwin
This commit is contained in:
Rüdiger Timm 2008-08-27 10:47:00 +00:00
parent dc1b6f6f09
commit 2728ec7cb2

View file

@ -8,7 +8,7 @@
#
# $RCSfile: mergemodule.pm,v $
#
# $Revision: 1.6 $
# $Revision: 1.7 $
#
# This file is part of OpenOffice.org.
#
@ -1146,8 +1146,8 @@ sub change_file_table
my $systemcall = "";
if ( $^O =~ /cygwin/i ) {
my $localunpackdir = $unpackdir;
$localunpackdir =~ s/\//\\\\/g;
my $localunpackdir = qx{cygpath -w "$unpackdir"};
$localunpackdir =~ s/\\/\\\\/g;
$systemcall = $expandfile . " " . $cabfilename . " -F:\\\* " . $localunpackdir;
}
else