Changeset 71


Ignore:
Timestamp:
Aug 31, 2007, 3:32:39 PM (12 years ago)
Author:
bruno
Message:

Still some fixes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • devel/pb/lib/ProjectBuilder/common.pm

    r70 r71  
    5151# Set delivery directory
    5252#
    53 my $topdir=basename($pbrc{$proj});
     53my $topdir=dirname($pbrc{$proj});
    5454chdir $topdir || die "Unable to change directory to $topdir";
    5555$ENV{'PBDESTDIR'}=$topdir."/delivery";
     
    6060if (not defined $ENV{'PBROOT'}) {
    6161    if (-f $pbrc{$proj}) {
    62         $pbroot = pb_init($pbrc{$proj},"pbroot");
     62        my $pbroot = pb_init($pbrc{$proj},"pbroot");
     63        my %pbroot = %$pbroot;
    6364        # There is normaly only one line in it
    6465        $ENV{'PBROOT'} = (values %$pbroot)[0] if (defined $pbroot);
     
    139140# Set build directory
    140141#
    141 $ENV{'PBBUILDDIR'}=$path."/build";
     142$ENV{'PBBUILDDIR'}=$topdir."/build";
    142143pbrm_rf($ENV{'PBBUILDDIR'}) if (-d "$ENV{'PBBUILDDIR'}");
    143144pbmkdir_p($ENV{'PBBUILDDIR'}) || die "Unable to recursively create $ENV{'PBBUILDDIR'}";
Note: See TracChangeset for help on using the changeset viewer.