diff options
| author | tv <tv> | 2004-09-27 14:44:31 +0000 |
|---|---|---|
| committer | tv <tv> | 2004-09-27 14:44:31 +0000 |
| commit | ad0ed31d36d105720f89877745f0954519630ef3 (patch) | |
| tree | 26e932f783aa307735fcd2e51b1f2c7a9133a965 | |
| parent | fe8f52ee0239deda07a46df81250bf745180867f (diff) | |
| download | pkgsrc-ad0ed31d36d105720f89877745f0954519630ef3.tar.gz | |
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.
| -rw-r--r-- | mk/bsd.pkg.defaults.mk | 8 | ||||
| -rw-r--r-- | mk/bsd.pkg.mk | 6 |
2 files changed, 4 insertions, 10 deletions
diff --git a/mk/bsd.pkg.defaults.mk b/mk/bsd.pkg.defaults.mk index 019b1d21f31..80d15b36eb1 100644 --- a/mk/bsd.pkg.defaults.mk +++ b/mk/bsd.pkg.defaults.mk @@ -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 @@ FETCH_RESUME_ARGS?= # empty # 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 --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 6464144a252..458d85a646d 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -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 @@ _PRINT_PLIST_DIRS_CMD= \ ${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 @@ BEGIN { \ .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) \ |