From 758aca682ca70669ae57ccef91befe17f9165783 Mon Sep 17 00:00:00 2001
From: Bruce Evans <bde@FreeBSD.org>
Date: Mon, 27 Mar 2000 18:29:46 +0000
Subject: [PATCH] Fixed wrong path to libperl in DPADD.

Fixed wrong path to libperl in LDADD in some funky objdir setups.

Use ${dir}/libfoo.a instead of -L${dir} -lfoo for local static libraries
in LDADD so that `make checkdpadd' doesn't report non-errors.

Fixed misformatting of $FreeBSD$.
---
 gnu/usr.bin/perl/miniperl/Makefile | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/gnu/usr.bin/perl/miniperl/Makefile b/gnu/usr.bin/perl/miniperl/Makefile
index e8c6214d23fe..351539d2f69d 100644
--- a/gnu/usr.bin/perl/miniperl/Makefile
+++ b/gnu/usr.bin/perl/miniperl/Makefile
@@ -1,6 +1,4 @@
-#
 # $FreeBSD$
-#
 
 PROG=	miniperl
 NOMAN=	true
@@ -8,8 +6,13 @@ CFLAGS+=-I${PERL5SRC} -I${.OBJDIR}
 SRCS=	miniperlmain.c config.h
 # Miniperl _must_ be static!!
 NOSHARED= yes
-DPADD=	${LIBPERL} ${LIBM} ${LIBCRYPT}
-LDADD=	-L${.OBJDIR}/../libperl -lperl -lm -lcrypt
+.if exists(${.OBJDIR}/../libperl/)
+MYLIBPERL= ${.OBJDIR}/../libperl/libperl.a
+.else
+MYLIBPERL= ${.CURDIR}/../libperl/libperl.a
+.endif
+DPADD=	${MYLIBPERL} ${LIBM} ${LIBCRYPT}
+LDADD=	${MYLIBPERL} -lm -lcrypt
 
 # Trick the bootstrap tools into thinking that miniperl is perl.
 # This gets overwritten.