alsa-lib: Fix packaging of alsa.m4

* TODO: alsa-conf packages lots of unneeded stuff (like bunch of card definitions,
not needed on handheld). Figure out and throw away.

diff --git a/packages/alsa/alsa-lib_1.0.11.bb b/packages/alsa/alsa-lib_1.0.11.bb
index 95b788e..5192e42 100644 (file)
--- a/packages/alsa/alsa-lib_1.0.11.bb
+++ b/packages/alsa/alsa-lib_1.0.11.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Alsa sound library"
 HOMEPAGE = "http://www.alsa-project.org"
 SECTION = "libs/multimedia"
 LICENSE = "GPL"
-PR = "r2"
+PR = "r3"
 
 # configure.in sets -D__arm__ on the command line for any arm system
 # (not just those with the ARM instruction set), this should be removed,
@@ -29,5 +29,5 @@ PACKAGES =+ "alsa-server libasound alsa-conf alsa-doc alsa-dev"
 FILES_${PN}-dbg += "${libdir}/alsa-lib/*/.debu*"
 FILES_libasound = "${libdir}/libasound.so*"
 FILES_alsa-server = "${bindir}/*"
-FILES_alsa-conf = "${datadir}"
-FILES_alsa-dev = "${libdir}/pkgconfig/ /usr/include/"
+FILES_alsa-conf = "${datadir}/alsa/"
+FILES_alsa-dev = "${libdir}/pkgconfig/ /usr/include/ ${datadir}/aclocal/*"

diff --git a/packages/alsa/alsa-lib_1.0.13.bb b/packages/alsa/alsa-lib_1.0.13.bb
index 8b6b7af..276067c 100644 (file)
--- a/packages/alsa/alsa-lib_1.0.13.bb
+++ b/packages/alsa/alsa-lib_1.0.13.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Alsa sound library"
 HOMEPAGE = "http://www.alsa-project.org"
 SECTION = "libs/multimedia"
 LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
 
 # configure.in sets -D__arm__ on the command line for any arm system
 # (not just those with the ARM instruction set), this should be removed,
@@ -30,5 +30,5 @@ PACKAGES =+ "alsa-server libasound alsa-conf alsa-doc alsa-dev"
 FILES_${PN}-dbg += "${libdir}/alsa-lib/*/.debu*"
 FILES_libasound = "${libdir}/libasound.so.*"
 FILES_alsa-server = "${bindir}/*"
-FILES_alsa-conf = "${datadir}"
-FILES_alsa-dev += "${libdir}/pkgconfig/ /usr/include/"
+FILES_alsa-conf = "${datadir}/alsa/"
+FILES_alsa-dev += "${libdir}/pkgconfig/ /usr/include/ ${datadir}/aclocal/*"