diff options
| author | tv <tv@pkgsrc.org> | 2004-08-17 17:48:11 +0000 |
|---|---|---|
| committer | tv <tv@pkgsrc.org> | 2004-08-17 17:48:11 +0000 |
| commit | f1a43312baa5698990975e72258af2a31a59750c (patch) | |
| tree | 5779ba0ef37bb3cd9c11722bd827cf0e70ce2441 /mk | |
| parent | 51c994abac568bc7d3cda26b8a135cc090c27e30 (diff) | |
| download | pkgsrc-f1a43312baa5698990975e72258af2a31a59750c.tar.gz | |
Don't put the .la transform in GENERATE_PLIST; that's too late to make it in
before any @dirrm's are executed. Rather, put it explicitly at the top of
the final static PLIST generation code.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index ad0571ebc31..b67c6a83296 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1490 2004/08/16 03:12:02 tv Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1491 2004/08/17 17:48:11 tv Exp $ # # This file is in the public domain. # @@ -408,11 +408,11 @@ CONFIGURE_ENV+= LIBTOOL="${LIBTOOL} ${LIBTOOL_FLAGS}" MAKE_ENV+= LIBTOOL="${LIBTOOL} ${LIBTOOL_FLAGS}" LIBTOOL_OVERRIDE?= libtool */libtool */*/libtool .if defined(LIBTOOL_LA_FILES) -GENERATE_PLIST+= ${SH} ../../mk/scripts/transform-la ${PREFIX} ${LIBTOOL_LA_FILES}; -_FILTER_LIBTOOL_LA_FILES= | ${GREP} -vxF \ - `${SH} ../../mk/scripts/transform-la ${PREFIX} ${LIBTOOL_LA_FILES} | ${SED} -e 's,^,-e ,'` +_DUMP_LIBTOOL_LA_FILES= ${SH} ../../mk/scripts/transform-la ${PREFIX} ${LIBTOOL_LA_FILES} +_FILTER_LIBTOOL_LA_FILES=| ${GREP} -vxF `${_DUMP_LIBTOOL_LA_FILES} | ${SED} -e 's,^,-e ,'` .endif .endif +_DUMP_LIBTOOL_LA_FILES?=${TRUE} .if defined(BUILD_USES_MSGFMT) && \ (!exists(/usr/bin/msgfmt) || ${_USE_GNU_GETTEXT} == "yes") @@ -4973,7 +4973,9 @@ _GENERATE_PLIST= \ ${SED} -e "s|^${PREFIX}/|@unexec ${RMDIR} -p %D/|" \ -e "s,$$, 2>/dev/null || ${TRUE},"; .else -_GENERATE_PLIST= ${CAT} ${_PLIST_SRC}; ${GENERATE_PLIST} +_GENERATE_PLIST= ${_DUMP_LIBTOOL_LA_FILES}; \ + ${CAT} ${_PLIST_SRC}; \ + ${GENERATE_PLIST} .endif .PHONY: plist |