From 883f1dcf7886efe70b326bf2003af23c082b1e95 Mon Sep 17 00:00:00 2001
From: Mark Murray <markm@FreeBSD.org>
Date: Wed, 23 Sep 1998 06:05:28 +0000
Subject: [PATCH] More make cleanups.

1) Part of the NOSHARED fix; I messed this up and managed to get
   perl installed without being linked to the shared library libperl.so.
   This broke Perl in ELF when linking in shared objects.

2) Start of a cleanup of the man3 page location. This will (eventually)
   allow for a the ports to put their pages in the "normal" ${PREFIX}-
   based location.

3) Nuke cruft.
---
 gnu/usr.bin/perl/miniperl/Makefile      | 3 ++-
 gnu/usr.bin/perl/perl/Makefile          | 4 +---
 gnu/usr.bin/perl/perl/install_perl_libs | 6 +++---
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/gnu/usr.bin/perl/miniperl/Makefile b/gnu/usr.bin/perl/miniperl/Makefile
index 1bbfb731bed7..2b8981ef561c 100644
--- a/gnu/usr.bin/perl/miniperl/Makefile
+++ b/gnu/usr.bin/perl/miniperl/Makefile
@@ -1,11 +1,12 @@
 #
-# $Id: Makefile,v 1.3 1998/09/12 19:16:33 markm Exp $
+# $Id: Makefile,v 1.4 1998/09/16 17:25:52 markm Exp $
 #
 
 PROG=	miniperl
 NOMAN=	true
 CFLAGS+=-I${PERL5SRC} -I${.OBJDIR}
 SRCS=	miniperlmain.c config.h
+NOSHARED= yes
 DPADD=	${LIBPERL} ${LIBM} ${LIBCRYPT}
 LDADD=	-lperl -lm -lcrypt
 
diff --git a/gnu/usr.bin/perl/perl/Makefile b/gnu/usr.bin/perl/perl/Makefile
index 18a43383c820..0479fbc37a0a 100644
--- a/gnu/usr.bin/perl/perl/Makefile
+++ b/gnu/usr.bin/perl/perl/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.12 1998/09/16 17:25:52 markm Exp $
+# $Id: Makefile,v 1.13 1998/09/22 12:00:58 markm Exp $
 #
 
 PROG=	perl
@@ -31,8 +31,6 @@ ${PROG}: Config.pm lib/auto/DynaLoader/DynaLoader.a
 
 lib/auto/DynaLoader/DynaLoader.a: Config.pm autosplit
 
-.ORDER: ${STATIC_EXT} ${DYNAMIC_EXT} ${NONXS_EXT}
-
 config.h: config_h.sh config.sh
 	sh config_h.sh
 
diff --git a/gnu/usr.bin/perl/perl/install_perl_libs b/gnu/usr.bin/perl/perl/install_perl_libs
index 7951efaddff3..aa2c0f5fe631 100755
--- a/gnu/usr.bin/perl/perl/install_perl_libs
+++ b/gnu/usr.bin/perl/perl/install_perl_libs
@@ -4,7 +4,7 @@
 # This was perl 5.00502's installperl, very thoroughly hacked to only
 # install the perl libraries.
 #
-# $Id$
+# $Id: install_perl_libs,v 1.1 1998/09/09 07:20:26 markm Exp $
 #
 
 BEGIN {
@@ -55,9 +55,9 @@ die "Patchlevel of perl ($patchlevel)",
 # Fetch some frequently-used items from %Config
 my $installprivlib = $destdir . $Config{installprivlib};
 my $installarchlib = $destdir . $Config{installarchlib};
-my $man1dir = $Config{man1dir};
+my $man1dir = $destdir . $Config{man1dir};
 my $man1ext = $Config{man1ext};
-my $man3dir = $Config{man3dir};
+my $man3dir = $destdir . $Config{man3dir};
 my $man3ext = $Config{man3ext};
 my $libperl = $Config{libperl};
 # Shared library and dynamic loading suffixes.