strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS ause015 (1.77.54); FILE MERGED

Browse source 
2005/01/11 10:24:50 rt 1.77.54.1: #i40302# If a destination is specified on command line set common_dest to that destination, too.
This commit is contained in:
Kurt Zenker 2005-01-14 10:33:44 +00:00
parent cb02e5545f
commit f085b96878
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
solenv/bin/deliver.pl
View file

@ -5,9 +5,9 @@ eval 'exec perl -wS $0 ${1+"$@"}'
#
# $RCSfile: deliver.pl,v $
#
# $Revision: 1.77 $
# $Revision: 1.78 $
#
# last change: $Author: rt $ $Date: 2004-11-18 16:26:11 $
# last change: $Author: kz $ $Date: 2005-01-14 11:33:44 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@ -78,7 +78,7 @@ use File::Spec;
( $script_name = $0 ) =~ s/^.*\b(\w+)\.pl$/$1/;
$id_str = ' $Revision: 1.77 $ ';
$id_str = ' $Revision: 1.78 $ ';
$id_str =~ /Revision:\s+(\S+)\s+\$/
? ($script_rev = $1) : ($script_rev = "-");
@ -496,8 +496,12 @@ sub init_globals
$common_build = 1;
if ((defined $common_outdir) && ($common_outdir ne "")) {
$common_outdir = $common_outdir . ".pro" if $inpath =~ /\.pro$/;
$common_dest = "$solarversion/$common_outdir" if ( !$dest );
$dest = "$solarversion/$inpath" if ( !$dest );
if ( $dest ) {
$common_dest = $dest;
} else {
$common_dest = "$solarversion/$common_outdir";
$dest = "$solarversion/$inpath";
}
} else {
print_error("common_build defined without common_outdir", 0);
exit(6);