pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk Per jlam's suggestion, remove the libtoolize condit...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/33f139b52494
branches:  trunk
changeset: 481201:33f139b52494
user:      tv <tv%pkgsrc.org@localhost>
date:      Mon Sep 27 19:37:36 2004 +0000

description:
Per jlam's suggestion, remove the libtoolize conditional altogether.  Some
packages install libtool archives without using USE_LIBTOOL.

diffstat:

 mk/bsd.pkg.mk |  8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)

diffs (40 lines):

diff -r 55d237fe4efa -r 33f139b52494 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Mon Sep 27 17:24:20 2004 +0000
+++ b/mk/bsd.pkg.mk     Mon Sep 27 19:37:36 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1502 2004/09/27 14:44:31 tv Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1503 2004/09/27 19:37:36 tv Exp $
 #
 # This file is in the public domain.
 #
@@ -4491,7 +4491,6 @@
        ${FIND} ${PREFIX}/. -xdev -newer ${EXTRACT_COOKIE} -type d -print
 _PRINT_LA_LIBNAMES=    ${.CURDIR}/../../mk/scripts/print-la-libnames
 
-.if defined(USE_LIBTOOL)
 _PRINT_PLIST_LIBTOOLIZE_FILTER?=                                       \
        (                                                               \
          if ${TEST} -d ${WRKDIR}; then                                 \
@@ -4516,9 +4515,6 @@
          fi;                                                           \
          ${RM} -f "$$fileslist" "$$libslist";                          \
        )
-.else
-_PRINT_PLIST_LIBTOOLIZE_FILTER?=       ${CAT}
-.endif
 
 .PHONY: print-PLIST
 .if !target(print-PLIST)
@@ -4959,12 +4955,10 @@
 .if ${PLIST_TYPE} == "dynamic"
 _PLIST_AWK_LIBTOOL?=   # empty
 .else
-.  if defined(USE_LIBTOOL)
 _PLIST_AWK_LIBTOOL?=                                                   \
 /\.la$$/ {                                                             \
        system("cd ${PREFIX} && ${SH} ${_PRINT_LA_LIBNAMES} " $$0)      \
 }
-.  endif
 .endif
 
 # _PLIST_AWK_SCRIPT hold the complete awk script for plist target.



Home | Main Index | Thread Index | Old Index