OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 27-Nov-2002 10:26:08
Branch: HEAD Handle: 2002112709260800
Modified files:
openpkg-src/openpkg-tool openpkg-build.pl
Log:
use %{l_prefix}/bin/rpm as default instead of searching the path.
If you want to search the path you can use -R rpm.
Summary:
Revision Changes Path
1.3 +2 -2 openpkg-src/openpkg-tool/openpkg-build.pl
____________________________________________________________________________
Index: openpkg-src/openpkg-tool/openpkg-build.pl
============================================================
$ cvs diff -u -r1.2 -r1.3 openpkg-build.pl
--- openpkg-src/openpkg-tool/openpkg-build.pl 27 Nov 2002 07:45:36 -0000 1.2
+++ openpkg-src/openpkg-tool/openpkg-build.pl 27 Nov 2002 09:26:08 -0000 1.3
@@ -142,7 +142,7 @@
my($RPM,$RPM_PRIV,$RPM_NPRIV,$CURL,$PROG);
-$RPM = $opt_R || $env{''}->{opt}->{'R'} || 'rpm';
+$RPM = $opt_R || $env{''}->{opt}->{'R'} || '@l_prefix@/bin/rpm';
$RPM = (`which $RPM` =~ m{^(/.*)})[0];
die "FATAL: cannot locate rpm in path\n" unless $RPM =~ m{^/};
@@ -156,7 +156,7 @@
$RPM_PRIV = ($opt_P ? $opt_P." ".$RPM : $RPM);
$RPM_NPRIV = ($opt_N ? $opt_N." ".$RPM : $RPM);
$CURL = $RPM;
-$CURL =~ s/bin\/rpm$/lib\/openpkg\/curl/
+$CURL =~ s/\/bin\/rpm$/\/lib\/openpkg\/curl/
or die "FATAL: cannot deduce curl path from $RPM\n";
($PROG) = $0 =~ /(?:.*\/)?(.*)/;
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
