OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 27-Jan-2004 21:27:30
Branch: HEAD Handle: 2004012720273000
Modified files:
openpkg-src/perl-openpkg
perl-openpkg.pl
Log:
use DESTDIR and fix --libdir implementation
Summary:
Revision Changes Path
1.5 +17 -20 openpkg-src/perl-openpkg/perl-openpkg.pl
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/perl-openpkg/perl-openpkg.pl
============================================================================
$ cvs diff -u -r1.4 -r1.5 perl-openpkg.pl
--- openpkg-src/perl-openpkg/perl-openpkg.pl 27 Jan 2004 13:19:11 -0000 1.4
+++ openpkg-src/perl-openpkg/perl-openpkg.pl 27 Jan 2004 20:27:30 -0000 1.5
@@ -338,9 +338,9 @@
my $perl_args = " PERL=$perlwrap FULLPERL=$perlwrap";
$perl_args .= " INSTALLDIRS=$CF->{perl_schema}";
$perl_args .= " INSTALLMAN3DIR=none INSTALLSITEMAN3DIR=none
INSTALLVENDORMAN3DIR=none";
- $perl_args .= " PREFIX=$CF->{path_buildroot}$CF->{path_prefix}";
+ $perl_args .= " DESTDIR=$CF->{path_buildroot} PREFIX=$CF->{path_prefix}";
if ($CF->{path_libdir} ne '') {
- $perl_args .= " LIB=$CF->{path_buildroot}$CF->{path_libdir}";
+ $perl_args .= " LIB=$CF->{path_libdir}";
}
if ([EMAIL PROTECTED]>{perl_args}}} >= 0) {
my $user_args = join(" ", @{$CF->{perl_args}});
@@ -421,26 +421,23 @@
# determine RPM installation file list
my @files = ();
- if ($CF->{path_libdir} ne '') {
- push(@files, '%not %dir '.$CF->{path_libdir});
- }
- else {
+ if ($CF->{path_libdir} eq '') {
push(@files, '%not %dir '.$CF->{path_prefix}.'/lib/perl');
+ push(@files, '%not %dir '.$pcfg->{installarchlib}.'/auto');
+ push(@files, '%not %dir '.$pcfg->{installarchlib});
+ push(@files, '%not %dir '.$pcfg->{installprivlib}.'/auto');
+ push(@files, '%not %dir '.$pcfg->{installprivlib});
+ push(@files, '%not %dir '.$pcfg->{sitelib_stem});
+ push(@files, '%not %dir '.$pcfg->{installsitearch}.'/auto');
+ push(@files, '%not %dir '.$pcfg->{installsitearch});
+ push(@files, '%not %dir '.$pcfg->{installsitelib}.'/auto');
+ push(@files, '%not %dir '.$pcfg->{installsitelib});
+ push(@files, '%not %dir '.$pcfg->{vendorlib_stem});
+ push(@files, '%not %dir '.$pcfg->{installvendorarch}.'/auto');
+ push(@files, '%not %dir '.$pcfg->{installvendorarch});
+ push(@files, '%not %dir '.$pcfg->{installvendorlib}.'/auto');
+ push(@files, '%not %dir '.$pcfg->{installvendorlib});
}
- push(@files, '%not %dir '.$pcfg->{installarchlib}.'/auto');
- push(@files, '%not %dir '.$pcfg->{installarchlib});
- push(@files, '%not %dir '.$pcfg->{installprivlib}.'/auto');
- push(@files, '%not %dir '.$pcfg->{installprivlib});
- push(@files, '%not %dir '.$pcfg->{sitelib_stem});
- push(@files, '%not %dir '.$pcfg->{installsitearch}.'/auto');
- push(@files, '%not %dir '.$pcfg->{installsitearch});
- push(@files, '%not %dir '.$pcfg->{installsitelib}.'/auto');
- push(@files, '%not %dir '.$pcfg->{installsitelib});
- push(@files, '%not %dir '.$pcfg->{vendorlib_stem});
- push(@files, '%not %dir '.$pcfg->{installvendorarch}.'/auto');
- push(@files, '%not %dir '.$pcfg->{installvendorarch});
- push(@files, '%not %dir '.$pcfg->{installvendorlib}.'/auto');
- push(@files, '%not %dir '.$pcfg->{installvendorlib});
# output RPM installation file list
my $out;
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
