From 36c1af94e209150f042116126b3975911f90e474 Mon Sep 17 00:00:00 2001 From: Bruce Evans Date: Tue, 7 Jul 1998 23:44:43 +0000 Subject: [PATCH] Use the installed version of perl for `make install'. It is now bootstrapped by `make world'. The version just built in ".." normally won't work if the target system is not binary compatible. --- gnu/usr.bin/perl/x2p/Makefile | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/gnu/usr.bin/perl/x2p/Makefile b/gnu/usr.bin/perl/x2p/Makefile index 9ec653dabf44..f2b2626ad866 100644 --- a/gnu/usr.bin/perl/x2p/Makefile +++ b/gnu/usr.bin/perl/x2p/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.13 1998/05/05 05:25:21 bde Exp $ +# $Id: Makefile,v 1.14 1998/05/12 23:02:14 jb Exp $ PROG= a2p @@ -9,15 +9,6 @@ YFLAGS= LDADD= -lm DPADD= ${LIBM} -# If perl exists in none of these places, something is horribly wrong. -.if exists(${.OBJDIR}/../perl/perl) -PERL=${.OBJDIR}/../perl/perl -.elif !defined(PERL) && exists(${.CURDIR}/../perl/perl) -PERL=${.CURDIR}/../perl/perl -.else -PERL= ${DESTDIR}/usr/bin/perl -.endif - MAN1+= a2p.1 s2p.1 h2ph.1 beforeinstall: @@ -27,7 +18,8 @@ beforeinstall: ${DESTDIR}${BINDIR} afterinstall: - (DESTDIR=${DESTDIR}; cd ${DESTDIR}/usr/include; ${PERL} ${DESTDIR}${BINDIR}/h2ph * machine/* sys/*) + (DESTDIR=${DESTDIR}; cd ${DESTDIR}/usr/include; \ + perl ${DESTDIR}${BINDIR}/h2ph * machine/* sys/*) .include "../../Makefile.inc" .include