cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

shared lib markers, ditch DYNLIBDIR.

Browse Source
This commit is contained in:
espie 2004-08-06 10:24:19 +00:00
parent b138d92476
commit bc4dd33fdd
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
infrastructure/install/make-plist
View File

@ -1,5 +1,5 @@
#! /usr/bin/perl
# $OpenBSD: make-plist,v 1.45 2004/08/06 09:37:15 espie Exp $
# $OpenBSD: make-plist,v 1.46 2004/08/06 10:24:19 espie Exp $
# Copyright (c) 2004 Marc Espie <espie@openbsd.org>
#
# Permission to use, copy, modify, and distribute this software for any
@ -653,6 +653,8 @@ for my $i (sort keys %$files) {
next;
} elsif ($type eq "info") {
$o = OpenBSD::PackingElement::InfoFile->new($short);
} elsif ($type eq "library") {
$o = OpenBSD::PackingElement::Lib->new($short);
} else {
$o = OpenBSD::PackingElement::File->new($short);
}
@ -685,9 +687,6 @@ for my $i (sort keys %$files) {
}
}
$o->add_object($p);
if ($type eq 'library' && dirname($i) eq '/usr/local/lib') {
$p->{wantdynlibdir} = 1;
}
$p->{nonempty} = 1;
if (defined $item) {
if (defined $item->{mode}) {
@ -743,12 +742,7 @@ for my $plist (@l) {
if (defined $orig) {
rename($orig->{filename}, $orig->{filename}.".orig");
}
open my $fh, '>', $plist->{filename};
$plist->write($fh);
if ($plist->{wantdynlibdir}) {
print $fh "DYNLIBDIR(\%D/lib)\n";
}
close $fh;
$plist->tofile($plist->{filename});
if (defined $orig) {
if (compare($plist->{filename}, $orig->{filename}.".orig") == 0) {
print $plist->{filename}, " unchanged, removing ", $orig->{filename}.".orig\n";