[pkgsrc/trunk]: pkgsrc/mk LIBTOOLIZE_PLIST doesn't even need to be conditiona...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1a5b51ebaff9
branches:  trunk
changeset: 481192:1a5b51ebaff9
user:      tv <tv%pkgsrc.org@localhost>
date:      Mon Sep 27 14:44:31 2004 +0000

description:
LIBTOOLIZE_PLIST doesn't even need to be conditional.  If USE_LIBTOOL is
set in the package Makefile, then a libtool transform will be done, period.

diffstat:

 mk/bsd.pkg.defaults.mk |  8 +-------
 mk/bsd.pkg.mk          |  6 +++---
 2 files changed, 4 insertions(+), 10 deletions(-)

diffs (49 lines):

diff -r c3c6b9453966 -r 1a5b51ebaff9 mk/bsd.pkg.defaults.mk
--- a/mk/bsd.pkg.defaults.mk    Mon Sep 27 14:42:39 2004 +0000
+++ b/mk/bsd.pkg.defaults.mk    Mon Sep 27 14:44:31 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.defaults.mk,v 1.283 2004/09/22 08:09:44 jlam Exp $
+# $NetBSD: bsd.pkg.defaults.mk,v 1.284 2004/09/27 14:44:31 tv Exp $
 #
 
 # A file providing defaults for pkgsrc and the packages collection.
@@ -259,12 +259,6 @@
 # Default: -R
 # Possible: depends on your FETCH_CMD value.
 
-LIBTOOLIZE_PLIST?=     yes
-# This determines whether to expand libtool archives in PLISTs into the
-# represented library names.
-# Possible: yes, no
-# Default: no
-
 PKG_INSTALLATION_PREFS?= overwrite pkgviews
 # This is a whitespace-separated list of installation types to try when
 # building a package, in order of preference.
diff -r c3c6b9453966 -r 1a5b51ebaff9 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Mon Sep 27 14:42:39 2004 +0000
+++ b/mk/bsd.pkg.mk     Mon Sep 27 14:44:31 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1501 2004/09/27 00:27:45 rh Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1502 2004/09/27 14:44:31 tv Exp $
 #
 # This file is in the public domain.
 #
@@ -4491,7 +4491,7 @@
        ${FIND} ${PREFIX}/. -xdev -newer ${EXTRACT_COOKIE} -type d -print
 _PRINT_LA_LIBNAMES=    ${.CURDIR}/../../mk/scripts/print-la-libnames
 
-.if !empty(LIBTOOLIZE_PLIST:M[yY][eE][sS])
+.if defined(USE_LIBTOOL)
 _PRINT_PLIST_LIBTOOLIZE_FILTER?=                                       \
        (                                                               \
          if ${TEST} -d ${WRKDIR}; then                                 \
@@ -4959,7 +4959,7 @@
 .if ${PLIST_TYPE} == "dynamic"
 _PLIST_AWK_LIBTOOL?=   # empty
 .else
-.  if !empty(LIBTOOLIZE_PLIST:M[yY][eE][sS])
+.  if defined(USE_LIBTOOL)
 _PLIST_AWK_LIBTOOL?=                                                   \
 /\.la$$/ {                                                             \
        system("cd ${PREFIX} && ${SH} ${_PRINT_LA_LIBNAMES} " $$0)      \