From bc4dd33fdd9c4c94eac283a5fff2708bc5711b8b Mon Sep 17 00:00:00 2001
From: espie <espie@openbsd.org>
Date: Fri, 6 Aug 2004 10:24:19 +0000
Subject: [PATCH] shared lib markers, ditch DYNLIBDIR.

---
 infrastructure/install/make-plist | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/infrastructure/install/make-plist b/infrastructure/install/make-plist
index bb033570daa..bb0e16e21fe 100755
--- a/infrastructure/install/make-plist
+++ b/infrastructure/install/make-plist
@@ -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";