Changeset 221 in ProjectBuilder for 0.8.5

Timestamp:

Oct 15, 2007, 2:26:09 PM (17 years ago)

Author:

Bruno Cornec

Message:

Fix problem building in RPM_BUILD_ROOT

Location:

0.8.5

Files:

• pb/bin/pb (modified) (2 diffs)
• pbconf/project-builder/rpm/project-builder.spec (modified) (1 diff)

0.8.5/pb/bin/pb

@@ -124 +124 @@
     pb_build2pkg();
 } elsif ($action =~ /^build2ssh$/) {
+    pb_build2ssh();
+} elsif ($action =~ /^cms2ssh$/) {
+    pb_cms2build();
     pb_build2ssh();
 } elsif ($action =~ /^pkg2ssh$/) {
@@ -855 +858 @@
     print "\tbuild2ssh: Send the tar files to a SSH host               \n";
     print "\n";
+    print "\tcms2ssh:   cms2build + build2ssh\n";
+    print "\n";
     print "\tpkg2ssh:   Send the packages built to a SSH host          \n";
     print "\n";

0.8.5/pbconf/project-builder/rpm/project-builder.spec

@@ -34 +34 @@
 
 %build
-%{__perl} Makefile.PL
+%{__perl} Makefile.PL destdir=$RPM_BUILD_ROOT
 make
 
 %install
-export DESTDIR=${RPM_BUILD_ROOT}
 make install
 
 %clean
-%{__rm} -rf %{buildroot}
+%{__rm} -rf $RPM_BUILD_ROOT
 
 %files