[pkgsrc/trunk]: pkgsrc/mk/buildlink3 G/C _WRAPPER_SH.LIBTOOL which isn't need...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7c153a7ae231
branches:  trunk
changeset: 481288:7c153a7ae231
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Thu Sep 30 16:34:32 2004 +0000

description:
G/C _WRAPPER_SH.LIBTOOL which isn't needed (it's value was being
overwritten within bsd.wrapper.mk anyway).  Also fix up the documentation
surrounding that section.  From Stoned Elipot in private email.

diffstat:

 mk/buildlink3/bsd.buildlink3.mk |  17 +++--------------
 1 files changed, 3 insertions(+), 14 deletions(-)

diffs (40 lines):

diff -r b1ffd9d875e2 -r 7c153a7ae231 mk/buildlink3/bsd.buildlink3.mk
--- a/mk/buildlink3/bsd.buildlink3.mk   Thu Sep 30 15:37:24 2004 +0000
+++ b/mk/buildlink3/bsd.buildlink3.mk   Thu Sep 30 16:34:32 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink3.mk,v 1.156 2004/09/24 16:15:18 jlam Exp $
+# $NetBSD: bsd.buildlink3.mk,v 1.157 2004/09/30 16:34:32 jlam Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -1006,12 +1006,6 @@
 # wrapper scripts are to be used instead of the actual compiler tools when
 # building software.
 #
-# BUILDLINK_CC, BUILDLINK_LD, etc. are the full paths to the wrapper
-#       scripts.
-#
-# ALIASES.CC, ALIASES.LD, etc. are the other names by which each wrapper
-#       may be invoked.
-#
 .if defined(USE_LIBTOOL)
 _WRAPPEES+=            LIBTOOL
 _WRAPPEES+=            SHLIBTOOL
@@ -1020,15 +1014,10 @@
 .endif
 _WRAP_ALIASES.LIBTOOL=         libtool
 _WRAP_ALIASES.SHLIBTOOL=       shlibtool
-
+_WRAP_ENV.LIBTOOL=             PATH="${WRAPPER_BINDIR}:${_WRAP_PATH}"; export PATH
+_WRAP_ENV.SHLIBTOOL=           ${_WRAP_ENV.LIBTOOL}
 _BLNK_LIBTOOL_FIX_LA=          ${WRAPPER_TMPDIR}/libtool-fix-la
 
-# We want libtool to invoke the wrapper scripts, too.
-_WRAPPER_SH.LIBTOOL=           ${BUILDLINK_SRCDIR}/libtool.sh
-_WRAP_ENV.LIBTOOL=             PATH="${WRAPPER_BINDIR}:${_WRAP_PATH}"; export PATH
-_WRAPPER_SH.SHLIBTOOL=         ${_WRAPPER_SH.LIBTOOL}
-_WRAP_ENV.SHLIBTOOL=           ${_WRAP_ENV.LIBTOOL}
-
 # We need to "unbuildlinkify" any libtool archives.
 _BLNK_WRAP_LT_UNTRANSFORM_SED= ${SUBST_SED.unwrap}