Changeset 877


Ignore:
Timestamp:
Oct 21, 2009, 8:44:32 PM (10 years ago)
Author:
bruno
Message:

Still there with File::Find workaround

File:
1 edited

Legend:

Unmodified
Added
Removed
  • devel/pb/bin/pb

    r875 r877  
    10551055                    print PROTO "i pkginfo\n";
    10561056                    print PROTO "i depend\n" if (-f "install/depend");
     1057                    $ENV{'PBSOLDESTDIR'} = $pkgdestdir;
    10571058                    find(\&create_solaris_prototype, $pkgdestdir."/.");
    10581059                }
    10591060                copy("install/depend", $pkgdestdir) if (-f "install/depend");
    10601061                copy("install/pkginfo", $pkgdestdir);
    1061                 pb_system("cd $pkgdestdir ; echo "BASEDIR=\"$pkgdestdir\"" >> pkginfo ; pkgmk -o -r $pkgdestdir -d $ENV{'PBBUILDDIR'}/$dtype","Packaging $pbpkg","verbose");
     1062                pb_system("cd $pkgdestdir ; echo \"BASEDIR=\"$pkgdestdir\"\" >> pkginfo ; pkgmk -o -r $pkgdestdir -d $ENV{'PBBUILDDIR'}/$dtype","Packaging $pbpkg","verbose");
    10621063                pb_system("pkgtrans -s $ENV{'PBBUILDDIR'}/$dtype $pbpkg-$pbver.pkg $pbpkg","Transforming $pbpkg","verbose");
    10631064                pb_system("rm -rf $ENV{'PBBUILDDIR'}/$dtype $pkgdestdir/install");
     
    11001101
    11011102    my $uidgid = "bin bin";
     1103    my $pkgdestdir = $ENV{'PBSOLDESTDIR'};
    11021104
    11031105    return if ($_ =~ /^Prototype/);
     
    11061108        $n =~ s~$pkgdestdir/~~;
    11071109        print PROTO "d none $n 0755 $uidgid\n";
    1108     if (-x $_) {
     1110    } elsif (-x $_) {
    11091111        my $n = $File::Find::name;
    11101112        $n =~ s~$pkgdestdir/~~;
Note: See TracChangeset for help on using the changeset viewer.