diff options
Diffstat (limited to 'helpcontent2/helpers/update_tree.pl')
| -rw-r--r-- | helpcontent2/helpers/update_tree.pl | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/helpcontent2/helpers/update_tree.pl b/helpcontent2/helpers/update_tree.pl index 71579750ad..018d55c053 100644 --- a/helpcontent2/helpers/update_tree.pl +++ b/helpcontent2/helpers/update_tree.pl @@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}' # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: update_tree.pl,v $ -# -# $Revision: 1.13 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify @@ -73,7 +69,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 +94,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";} } |