From 3a9e553e2fe90d2131eea1edee6c85c4fde6dfb6 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 24 Jul 1998 01:47:33 +0000 Subject: Now I remember why I suggested a ${LIBTOOL} variable: libtool is also used in manual {pre,do,post}-install targets in pkg Makefiles. Define ${LIBTOOL} to be ${LOCALBASE}/bin/libtool, but do not allow it to be overridden. --- mk/bsd.pkg.mk | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 2ad76171e67..db1b0df398c 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.125 1998/07/24 01:41:15 tv Exp $ +# $NetBSD: bsd.pkg.mk,v 1.126 1998/07/24 01:47:33 tv Exp $ # # This file is in the public domain. # @@ -138,9 +138,10 @@ BUILD_DEPENDS+= ${X11BASE}/include/Xm/Xm.h:../../x11/lesstif RUN_DEPENDS+= ${X11BASE}/include/Xm/Xm.h:../../x11/lesstif .endif .if defined(USE_LIBTOOL) -BUILD_DEPENDS+= ${LOCALBASE}/bin/libtool:../../devel/libtool -CONFIGURE_ENV+= LIBTOOL=${LOCALBASE}/bin/libtool -MAKE_ENV+= LIBTOOL=${LOCALBASE}/bin/libtool +LIBTOOL= ${LOCALBASE}/bin/libtool +BUILD_DEPENDS+= ${LIBTOOL}:../../devel/libtool +CONFIGURE_ENV+= LIBTOOL=${LIBTOOL} +MAKE_ENV+= LIBTOOL=${LIBTOOL} .endif .if exists(${PKGSRCDIR}/../Makefile.inc) -- cgit v1.2.3