libtool: add ${PN} in middle of package list to ensure .m4 get with ${PN}

With the new order scheme, ${PN} needs to be in the middle
for the .m4 files to be packaged, otherwise the move the
-dev package which is wrong in this case.

(From OE-Core rev: 57ad9075ea7521e8fa20d62aac31afb2e2130348)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 6 insertions, 1 deletions

diff --git a/meta/recipes-devtools/libtool/libtool-2.4.2.inc b/meta/recipes-devtools/libtool/libtool-2.4.2.inc
index 05a2e6d2c9..5b9557ee49 100644
--- a/meta/recipes-devtools/libtool/libtool-2.4.2.inc
+++ b/meta/recipes-devtools/libtool/libtool-2.4.2.inc
@@ -37,7 +37,12 @@ EXTRA_AUTORECONF = "--exclude=libtoolize"
 DEPENDS = "libtool-native"
 
 PACKAGES =+ "libltdl libltdl-dev libltdl-dbg libltdl-staticdev"
-FILES_${PN} += "${datadir}/aclocal*"
+FILES_${PN} += "${datadir}/aclocal"
+FILES_${PN}-dev = "${includedir} ${FILES_SOLIBSDEV} ${libdir}/*.la \
+                ${libdir}/*.o ${libdir}/pkgconfig ${datadir}/pkgconfig \
+                ${base_libdir}/*.o ${libdir}/${BPN}/*.la ${base_libdir}/*.la"
+
+#FILES_${PN}-dev := "${@oe_filter_out('${datadir}/aclocal', '${FILES_libtool-dev}', d)}"
 FILES_libltdl = "${libdir}/libltdl${SOLIBS}"
 FILES_libltdl-dev = "${libdir}/libltdl${SOLIBSDEV} ${includedir}"
 FILES_libltdl-staticdev = "${libdir}/libltdl.a"