Changeset 879

Timestamp:

10/23/09 20:26:41 (4 years ago)

Author:

bruno

Message:

• Some additional solaris improvements

File:

• devel/pb/bin/pb (modified) (1 diff)

devel/pb/bin/pb

@@ -1055 +1055 @@
                     print PROTO "i pkginfo\n";
                     print PROTO "i depend\n" if (-f "install/depend");
-                    $ENV{'PBSOLDESTDIR'} = $pkgdestdir;
-                    find(\&create_solaris_prototype, $pkgdestdir);
+                    $ENV{'PBSOLDESTDIR'} = "$pkgdestdir/delivery";
+                    find(\&create_solaris_prototype, "$pkgdestdir/delivery");
                 }
                 copy("install/depend", $pkgdestdir) if (-f "install/depend");
                 copy("install/pkginfo", $pkgdestdir);
-                pb_system("cd $pkgdestdir ; echo \"BASEDIR=\"$pkgdestdir\"\" >> pkginfo ; cd delivery ; pkgmk -o -r $pkgdestdir -d $ENV{'PBBUILDDIR'}/$dtype","Packaging $pbpkg","verbose");
-                pb_system("cd $ENV{'PBBUILDDIR'}/$dtype ;  pkgtrans -s `pwd` ../$pbpkg-$pbver.pkg","Transforming $pbpkg","verbose");
+                pb_system("cd $pkgdestdir/delivery ; pkgmk -o -r $pkgdestdir/delivery -d $ENV{'PBBUILDDIR'}/$dtype","Packaging $pbpkg","verbose");
+                pb_system("cd $ENV{'PBBUILDDIR'}/$dtype ;  pkgtrans -o -n -s $ENV{'PBBUILDDIR'}/$dtype $ENV{'PBBUILDDIR'}/$pbpkg-$pbver.pkg < /dev/null","Transforming $pbpkg","verbose");
                 pb_system("cd $ENV{'PBBUILDDIR'} ;  gzip -c9 $pbpkg-$pbver.pkg","Compressing $pbpkg-$pbver.pkg","verbose");
-                pb_system("rm -rf $ENV{'PBBUILDDIR'}/$dtype $pkgdestdir/install");
+                pb_system("rm -rf $ENV{'PBBUILDDIR'}/$dtype $pkgdestdir");
             }
             chdir ".." || die "Unable to chdir to parent dir";