[pkgsrc/trunk]: pkgsrc/mk Don't put the .la transform in GENERATE_PLIST; that...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/426b6e67ef83
branches:  trunk
changeset: 479603:426b6e67ef83
user:      tv <tv%pkgsrc.org@localhost>
date:      Tue Aug 17 17:48:11 2004 +0000

description:
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:

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

diffs (37 lines):

diff -r 126a4d2845e7 -r 426b6e67ef83 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Tue Aug 17 17:33:40 2004 +0000
+++ b/mk/bsd.pkg.mk     Tue Aug 17 17:48:11 2004 +0000
@@ -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 @@
 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 ,'`
-.endif
-.endif
+_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 @@
                ${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