diff options
| author | Vladimir Glazunov <vg@openoffice.org> | 2009-12-14 11:21:26 +0100 |
|---|---|---|
| committer | Vladimir Glazunov <vg@openoffice.org> | 2009-12-14 11:21:26 +0100 |
| commit | 487ffc9d2eafc571a7cabdfffc2541608f3c74b1 (patch) | |
| tree | 25c8d4aeda3cfedc3cec1ea133551a680d03209a /helpcontent2/helpers | |
| parent | decca1502542de492ebfa996ade68d9f3b3a048f (diff) | |
| parent | 731f4e5b5a75384bc37a3e014f0d7dce8488df52 (diff) | |
CWS-TOOLING: integrate CWS localization37fix_DEV300
ooo/DEV300_m68
Diffstat (limited to 'helpcontent2/helpers')
| -rw-r--r-- | helpcontent2/helpers/update_tree.pl | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/helpcontent2/helpers/update_tree.pl b/helpcontent2/helpers/update_tree.pl index 71579750ad..23795168c1 100644 --- a/helpcontent2/helpers/update_tree.pl +++ b/helpcontent2/helpers/update_tree.pl @@ -73,7 +73,7 @@ if ( ! defined $prj ) { ($source_dir = $scriptname) =~ s/\/update_tree.pl/\/..\/source/; ($source_dir_xhp = $scriptname) =~ s/\/update_tree.pl/\/..\/source/; - if ( defined $ENV{TRYSDF} && defined $ENV{LOCALIZESDF} ) + if ( defined $ENV{TRYSDF} || defined $ENV{LOCALIZESDF} ) { if( defined $ENV{LOCALIZATION_FOUND} && $ENV{LOCALIZATION_FOUND} eq "YES" ) { @@ -98,19 +98,16 @@ if ( ! defined $prj ) { $source_dir_xhp = "$prj\/source"; $treestrings = "$source_dir/text/shared/tree_strings.xhp"; - if ( defined $ENV{TRYSDF} && defined $ENV{LOCALIZESDF} ) + if( defined $ENV{LOCALIZATION_FOUND} && $ENV{LOCALIZATION_FOUND} eq "YES" ) { - if( defined $ENV{LOCALIZATION_FOUND} && $ENV{LOCALIZATION_FOUND} eq "YES" ) - { - $source_dir = $ENV{TRYSDF}; - } - else - { - $source_dir = $ENV{LOCALIZESDF}; - } - if( $is_win eq "false" ) { $source_dir =~ s/\/auxiliary\/localize.sdf$// ; } - else { $source_dir =~ s/\\auxiliary\\localize.sdf$// ; } + $source_dir = $ENV{TRYSDF}; + } + else + { + $source_dir = $ENV{LOCALIZESDF}; } + if( $is_win eq "false" ) { $source_dir =~ s/\/auxiliary\/localize.sdf$// ; } + else { $source_dir =~ s/\\auxiliary\\localize.sdf$// ; } #else {die "ERROR: The env variables TRYSDF LOCALIZATION_FOUND LOCALIZESDF not found ... something is wrong!\n";} } |