summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2004-11-09 17:32:43 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2004-11-09 17:32:43 +0000
commitb2f0c848b5e98533218fb0f40ff14956bbadc10b (patch)
tree4b66b07a7e9b29e05be38fb84a47e697b3fb2df3
parentd8c44e41682b4c8bfaa2eb963b9828361307787e (diff)
INTEGRATION: CWS vq04 (1.2.134); FILE MERGED
2004/11/05 03:15:19 vq 1.2.134.1: #i36413# Fix instsetoo_native problems with W32-tcsh.
-rw-r--r--solenv/bin/modules/installer/pathanalyzer.pm7
1 files changed, 4 insertions, 3 deletions
diff --git a/solenv/bin/modules/installer/pathanalyzer.pm b/solenv/bin/modules/installer/pathanalyzer.pm
index 6ff01a05193c..be837c205418 100644
--- a/solenv/bin/modules/installer/pathanalyzer.pm
+++ b/solenv/bin/modules/installer/pathanalyzer.pm
@@ -2,9 +2,9 @@
#
# $RCSfile: pathanalyzer.pm,v $
#
-# $Revision: 1.2 $
+# $Revision: 1.3 $
#
-# last change: $Author: svesik $ $Date: 2004-04-20 12:28:35 $
+# last change: $Author: hr $ $Date: 2004-11-09 18:32:43 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -99,7 +99,8 @@ sub make_absolute_filename_to_relative_filename
if ( $installer::globals::iswin )
{
- if ( $$longfilenameref =~ /^.*\\(\S.+\S?)/ )
+ # Either '/' or '\'. It would be possible to use $installer::globals::separator.
+ if ( $$longfilenameref =~ /^.*[\/\\](\S.+\S?)/ )
{
$$longfilenameref = $1;
}