From: Mikko Rapeli <mikko.rapeli@bmw.de>
Date: Tue, 18 Aug 2020 11:31:43 +0000 (+0300)
Subject: alsa-ucm-conf: use ${datadir} in do_install()
X-Git-Tag: 2020-04.3-dunfell~74
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=da9571716c40fd8129e8c8f24f07302458b43e31;p=openembedded-core.git

alsa-ucm-conf: use ${datadir} in do_install()

Fixes build with custom directory structure.

Signed-off-by: Mikko Rapeli <mikko.rapeli@bmw.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 710567168eca3d9a580f768a82db033f1cca3cec)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---

diff --git a/meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.1.2.bb b/meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.1.2.bb
index 469d1f7a95..a432d5de07 100644
--- a/meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.1.2.bb
+++ b/meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.1.2.bb
@@ -13,9 +13,9 @@ SRC_URI[sha256sum] = "ea8a86875f4cf430d49a662a04a6d6c606c5c9d67e54cb944c4d77b245
 inherit allarch
 
 do_install() {
-        install -d ${D}/usr/share/alsa
-        cp -r ${S}/ucm ${D}/usr/share/alsa
-        cp -r ${S}/ucm2 ${D}/usr/share/alsa
+        install -d "${D}${datadir}/alsa"
+        cp -r "${S}/ucm" "${D}${datadir}/alsa"
+        cp -r "${S}/ucm2" "${D}${datadir}/alsa"
 }
 
 PACKAGES = "${PN}"