View | Details | Raw Unified | Return to issue 11319
Collapse All | Expand All

(-)solenv/bin/deliver.pl.keep (-3 / +10 lines)
Lines 421-427 Link Here
421
    }
421
    }
422
422
423
    # product build?
423
    # product build?
424
    $common_outdir = $common_outdir . ".pro" if $inpath =~ /\.pro$/;
424
    if ($common_outdir ne "") {
425
        $common_outdir = $common_outdir . ".pro" if $inpath =~ /\.pro$/;
426
    }
425
427
426
    $ext = "";
428
    $ext = "";
427
    if ( ($opt_minor || $updminor) && !$dest ) {
429
    if ( ($opt_minor || $updminor) && !$dest ) {
Lines 434-441 Link Here
434
        }
436
        }
435
    }
437
    }
436
438
437
    $common_dest = "$solarversion/$common_outdir" if ( !$dest );
439
    if ($common_outdir ne "") { 
438
    $dest = "$solarversion/$inpath" if ( !$dest );
440
        $common_dest = "$solarversion/$common_outdir" if ( !$dest );
441
        $dest = "$solarversion/$inpath" if ( !$dest );
442
    } else {
443
        $dest = "$solarversion/$inpath" if ( !$dest );
444
        $common_dest = $dest;
445
    }
439
446
440
    # the following macros are obsolete, will be flagged as error
447
    # the following macros are obsolete, will be flagged as error
441
    # %__WORKSTAMP%
448
    # %__WORKSTAMP%

Return to issue 11319